From: Tom Hughes Date: Wed, 13 Jan 2021 20:40:48 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/2994' X-Git-Tag: live~1735 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4abd9cfcf19701bf43322374c5df6dd586449e54?hp=bab39572a17146d5b6e696f0ba584a89daac10c7 Merge remote-tracking branch 'upstream/pull/2994' --- diff --git a/.coveralls.yml b/.coveralls.yml deleted file mode 100644 index 91600595a..000000000 --- a/.coveralls.yml +++ /dev/null @@ -1 +0,0 @@ -service_name: travis-ci diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 539fa4a1d..7b28ebfcd 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,3 +5,7 @@ updates: directory: "/" schedule: interval: "daily" + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml new file mode 100644 index 000000000..84ce14afc --- /dev/null +++ b/.github/workflows/lint.yml @@ -0,0 +1,115 @@ +name: Lint +on: + - push + - pull_request +env: + os: ubuntu-20.04 + ruby: 2.7 +jobs: + rubocop: + name: RuboCop + runs-on: ubuntu-20.04 + steps: + - name: Check out code + uses: actions/checkout@v2 + - name: Setup ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: ${{ env.ruby }} + - name: Cache gems + uses: actions/cache@v2 + with: + path: vendor/bundle + key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }} + restore-keys: | + bundle-${{ env.os }}-${{ env.ruby }}- + - name: Install gems + run: | + gem install bundler + bundle config set deployment true + bundle install --jobs 4 --retry 3 + - name: Run rubocop + run: bundle exec rubocop --format fuubar + erblint: + name: ERB Lint + runs-on: ubuntu-20.04 + steps: + - name: Check out code + uses: actions/checkout@v2 + - name: Setup ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: ${{ env.ruby }} + - name: Cache gems + uses: actions/cache@v2 + with: + path: vendor/bundle + key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }} + restore-keys: | + bundle-${{ env.os }}-${{ env.ruby }}- + - name: Install gems + run: | + gem install bundler + bundle config set deployment true + bundle install --jobs 4 --retry 3 + - name: Run erblint + run: bundle exec erblint . + eslint: + name: ESLint + runs-on: ubuntu-20.04 + steps: + - name: Check out code + uses: actions/checkout@v2 + - name: Setup ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: ${{ env.ruby }} + - name: Cache gems + uses: actions/cache@v2 + 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@v1 + with: + path: node_modules + key: yarn-${{ env.os }}-${{ hashFiles('yarn.lock') }} + restore-keys: | + yarn-${{ env.os }}- + - name: Install gems + run: | + gem install bundler + bundle config set deployment true + bundle install --jobs 4 --retry 3 + - name: Install node modules + run: bundle exec rake yarn:install + - name: Create dummy database configuration + run: cp config/example.database.yml config/database.yml + - name: Run eslint + run: bundle exec rake eslint + brakeman: + name: Brakeman + runs-on: ubuntu-20.04 + steps: + - name: Check out code + uses: actions/checkout@v2 + - name: Setup ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: ${{ env.ruby }} + - name: Cache gems + uses: actions/cache@v2 + with: + path: vendor/bundle + key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }} + restore-keys: | + bundle-${{ env.os }}-${{ env.ruby }}- + - name: Install gems + run: | + gem install bundler + bundle config set deployment true + bundle install --jobs 4 --retry 3 + - name: Run brakeman + run: bundle exec brakeman -q diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml new file mode 100644 index 000000000..5fcfdf69b --- /dev/null +++ b/.github/workflows/tests.yml @@ -0,0 +1,85 @@ +name: Tests +on: + - push + - pull_request +jobs: + test: + name: Ubuntu ${{ matrix.ubuntu }}, Ruby ${{ matrix.ruby }} + strategy: + matrix: + ubuntu: [18.04, 20.04] + ruby: [2.5, 2.7] + runs-on: ubuntu-${{ matrix.ubuntu }} + env: + RAILS_ENV: test + OPENSTREETMAP_MEMCACHE_SERVERS: 127.0.0.1 + steps: + - name: Checkout source + uses: actions/checkout@v2 + - name: Setup ruby + uses: actions/setup-ruby@v1 + with: + ruby-version: ${{ matrix.ruby }} + - name: Cache gems + uses: actions/cache@v2 + 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@v1 + with: + path: node_modules + key: yarn-ubuntu-${{ matrix.ubuntu }}-${{ hashFiles('yarn.lock') }} + restore-keys: | + yarn-ubuntu-${{ matrix.ubuntu }}- + - name: Install packages + run: | + sudo apt-get -yqq update + sudo apt-get -yqq install memcached + - name: Install gems + run: | + gem install bundler + bundle config set deployment true + bundle install --jobs 4 --retry 3 + - name: Create database + run: | + sudo systemctl start postgresql + sudo -u postgres createuser -s $(id -un) + createdb openstreetmap + psql -c "CREATE EXTENSION btree_gist" openstreetmap + psql -f db/functions/functions.sql openstreetmap + - name: Configure rails + run: | + cp config/github.database.yml config/database.yml + cp config/example.storage.yml config/storage.yml + touch config/settings.local.yml + - name: Populate database + run: | + sed -f script/normalise-structure db/structure.sql > db/structure.expected + bundle exec rake db:migrate + sed -f script/normalise-structure db/structure.sql > db/structure.actual + diff -uw db/structure.expected db/structure.actual + - name: Export javascript strings + run: bundle exec rake i18n:js:export + - name: Install node modules + run: bundle exec rake yarn:install + - name: Run tests + run: bundle exec rake test:db + - name: Report completion to Coveralls + uses: coverallsapp/github-action@v1.1.2 + with: + github-token: ${{ secrets.github_token }} + flag-name: ubuntu-${{ matrix.ubuntu }}-ruby-${{ matrix.ruby }} + parallel: true + finish: + name: Finalise + needs: test + runs-on: ubuntu-latest + steps: + - name: Report completion to Coveralls + uses: coverallsapp/github-action@v1.1.2 + with: + github-token: ${{ secrets.github_token }} + parallel-finished: true diff --git a/.rubocop.yml b/.rubocop.yml index 200ab8a00..9b7a28d87 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -6,7 +6,7 @@ require: - rubocop-rails AllCops: - TargetRubyVersion: 2.7 + TargetRubyVersion: 2.5 NewCops: enable Exclude: - 'vendor/**/*' diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index c1060cbe2..9aea439cb 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,6 +1,6 @@ # This configuration was generated by # `rubocop --auto-gen-config` -# on 2020-09-02 06:16:56 UTC using RuboCop version 0.90.0. +# on 2021-01-11 19:00:54 UTC using RuboCop version 1.8.1. # The point is for the user to remove these configuration records # one by one as the offenses are removed from the code base. # Note that changes in the inspected code, or installation of new @@ -13,12 +13,12 @@ require: - rubocop-performance - rubocop-rails -# Offense count: 568 +# Offense count: 544 # Cop supports --auto-correct. # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns. # URISchemes: http, https Layout/LineLength: - Max: 250 + Max: 248 # Offense count: 36 # Configuration parameters: AllowSafeAssignment. @@ -39,14 +39,24 @@ Lint/AssignmentInCondition: - 'lib/osm.rb' - 'script/deliver-message' -# Offense count: 682 -# Configuration parameters: IgnoredMethods. +# Offense count: 8 +# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches. +Lint/DuplicateBranch: + Exclude: + - 'app/controllers/api_controller.rb' + - 'app/controllers/diary_entries_controller.rb' + - 'app/controllers/geocoder_controller.rb' + - 'app/helpers/browse_tags_helper.rb' + - 'lib/password_hash.rb' + +# Offense count: 487 +# Configuration parameters: IgnoredMethods, CountRepeatedAttributes. Metrics/AbcSize: Max: 194 -# Offense count: 72 -# Configuration parameters: CountComments, CountAsOne, ExcludedMethods. -# ExcludedMethods: refine +# Offense count: 62 +# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods. +# IgnoredMethods: refine Metrics/BlockLength: Max: 71 @@ -55,43 +65,41 @@ Metrics/BlockLength: Metrics/BlockNesting: Max: 5 -# Offense count: 25 +# Offense count: 24 # Configuration parameters: CountComments, CountAsOne. Metrics/ClassLength: - Max: 643 + Max: 582 -# Offense count: 68 +# Offense count: 52 # Configuration parameters: IgnoredMethods. Metrics/CyclomaticComplexity: Max: 26 -# Offense count: 735 -# Configuration parameters: CountComments, CountAsOne, ExcludedMethods. +# Offense count: 553 +# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods. Metrics/MethodLength: Max: 179 -# Offense count: 4 -# Configuration parameters: CountKeywordArgs. +# Offense count: 1 +# Configuration parameters: CountKeywordArgs, MaxOptionalParameters. Metrics/ParameterLists: - Max: 9 + Max: 6 -# Offense count: 69 +# Offense count: 56 # Configuration parameters: IgnoredMethods. Metrics/PerceivedComplexity: Max: 26 -# Offense count: 540 +# Offense count: 365 Minitest/MultipleAssertions: Max: 81 -# Offense count: 6 +# Offense count: 4 Naming/AccessorMethodName: Exclude: - 'app/controllers/application_controller.rb' - 'app/helpers/title_helper.rb' - - 'app/models/old_way.rb' - 'lib/osm.rb' - - 'lib/potlatch.rb' # Offense count: 8 # Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros. @@ -101,7 +109,6 @@ Naming/AccessorMethodName: # MethodDefinitionMacros: define_method, define_singleton_method Naming/PredicateName: Exclude: - - 'spec/**/*' - 'app/models/changeset.rb' - 'app/models/old_node.rb' - 'app/models/old_relation.rb' @@ -127,7 +134,7 @@ Rails/HasAndBelongsToMany: - 'app/models/changeset.rb' - 'app/models/user.rb' -# Offense count: 4 +# Offense count: 3 # Configuration parameters: Include. # Include: app/helpers/**/*.rb Rails/HelperInstanceVariable: @@ -145,7 +152,7 @@ Rails/NotNullColumn: - 'db/migrate/025_add_end_time_to_changesets.rb' - 'db/migrate/20120404205604_add_user_and_description_to_redaction.rb' -# Offense count: 19 +# Offense count: 8 Rails/OutputSafety: Exclude: - 'app/controllers/users_controller.rb' @@ -153,22 +160,22 @@ Rails/OutputSafety: - 'lib/rich_text.rb' - 'test/helpers/application_helper_test.rb' -# Offense count: 95 +# Offense count: 80 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle. # SupportedStyles: strict, flexible Rails/TimeZone: Enabled: false -# Offense count: 572 +# Offense count: 558 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle. # SupportedStyles: always, always_true, never Style/FrozenStringLiteralComment: Enabled: false -# Offense count: 78 +# Offense count: 54 # Cop supports --auto-correct. # Configuration parameters: Strict. Style/NumericLiterals: - MinDigits: 11 + MinDigits: 15 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 77b17cf9d..000000000 --- a/.travis.yml +++ /dev/null @@ -1,38 +0,0 @@ -dist: bionic -language: ruby -rvm: - - 2.7.0 -cache: - - bundler -addons: - postgresql: 9.5 - apt: - packages: - - firefox-geckodriver - - libarchive-dev - - libgd-dev - - libffi-dev - - libbz2-dev -services: - - memcached -before_script: - - sed -e 's/ IMMUTABLE / /' -e "/^--/d" db/structure.sql > db/structure.expected - - psql -U postgres -c "CREATE DATABASE openstreetmap" - - psql -U postgres -c "CREATE EXTENSION btree_gist" openstreetmap - - psql -U postgres -f db/functions/functions.sql openstreetmap - - cp config/travis.database.yml config/database.yml - - cp config/example.storage.yml config/storage.yml - - touch config/settings.local.yml - - echo -e "---\nmemcache_servers:\n - 127.0.0.1" > config/settings/test.local.yml - - bundle exec rake db:migrate - - bundle exec rake i18n:js:export - - bundle exec rake yarn:install -script: - - bundle exec rubocop -f fuubar - - bundle exec rake eslint - - bundle exec erblint . - - bundle exec brakeman -q - - bundle exec rake db:structure:dump - - sed -e "/idle_in_transaction_session_timeout/d" -e 's/ IMMUTABLE / /' -e "/^--/d" db/structure.sql > db/structure.actual - - diff -uw db/structure.expected db/structure.actual - - bundle exec rake test:db diff --git a/CONFIGURE.md b/CONFIGURE.md index 598ea3f65..96aac9f96 100644 --- a/CONFIGURE.md +++ b/CONFIGURE.md @@ -8,7 +8,7 @@ Many settings are available in `config/settings.yml`. You can customize your ins ## Populating the database -Your installation comes with no geographic data loaded. You can either create new data using one of the editors (Potlatch 2, iD, JOSM etc) or by loading an OSM extract. +Your installation comes with no geographic data loaded. You can either create new data using one of the editors (iD, JOSM etc) or by loading an OSM extract. After installing but before creating any users or data, import an extract with [Osmosis](https://wiki.openstreetmap.org/wiki/Osmosis) and the [``--write-apidb``](https://wiki.openstreetmap.org/wiki/Osmosis/Detailed_Usage#--write-apidb_.28--wd.29) task. @@ -58,11 +58,10 @@ $ bundle exec rails console Three of the built-in applications communicate via the API, and therefore need OAuth consumer keys configured. These are: -* Potlatch 2 * iD * The website itself (for the Notes functionality) -For example, to use the Potlatch 2 editor you need to register it as an OAuth application. +For example, to use the iD editor you need to register it as an OAuth application. Do the following: * Log into your Rails Port instance - e.g. http://localhost:3000 @@ -70,25 +69,25 @@ Do the following: * Click on "my settings" on the user page * Click on "oauth settings" on the My settings page * Click on 'Register your application'. -* Unless you have set up alternatives, use Name: "Local Potlatch" and URL: "http://localhost:3000" +* Unless you have set up alternatives, use Name: "Local iD" and URL: "http://localhost:3000" * Check the 'modify the map' box. * Everything else can be left with the default blank values. * Click the "Register" button * On the next page, copy the "consumer key" * Edit config/settings.local.yml in your rails tree -* Add the "potlatch2_key" configuration key and the consumer key as the value +* Add the "id_key" configuration key and the consumer key as the value * Restart your rails server An example excerpt from settings.local.yml: ``` # Default editor -default_editor: "potlatch2" -# OAuth consumer key for Potlatch 2 -potlatch2_key: "8lFmZPsagHV4l3rkAHq0hWY5vV3Ctl3oEFY1aXth" +default_editor: "id" +# OAuth consumer key for iD +id_key: "8lFmZPsagHV4l3rkAHq0hWY5vV3Ctl3oEFY1aXth" ``` -Follow the same process for registering and configuring iD (`id_key`) and the website/Notes (`oauth_key`), or to save time, simply reuse the same consumer key for each. +Follow the same process for registering and configuring the website/Notes (`oauth_key`), or to save time, simply reuse the same consumer key for each. ## Troubleshooting diff --git a/Gemfile b/Gemfile index 10cfb970e..40476a5b8 100644 --- a/Gemfile +++ b/Gemfile @@ -3,12 +3,6 @@ source "https://rubygems.org" # Require rails gem "rails", "6.0.3.4" -# Require things which have moved to gems in ruby 1.9 -gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19 - -# Require things which have moved to gems in ruby 2.0 -gem "psych", :platforms => :ruby_20 - # Require json for multi_json gem "json" @@ -88,9 +82,6 @@ gem "libxml-ruby", ">= 2.0.5", :require => "libxml" gem "htmlentities" gem "sanitize" -# Load SystemTimer for implementing request timeouts -gem "SystemTimer", ">= 1.1.3", :require => "system_timer", :platforms => :ruby_18 - # Load faraday for mockable HTTP client gem "faraday" @@ -133,6 +124,7 @@ group :development do gem "annotate" gem "better_errors" gem "binding_of_caller" + gem "debug_inspector", "< 1.0.0" gem "listen" gem "vendorer" end @@ -141,16 +133,17 @@ end group :test do gem "brakeman" gem "capybara", ">= 2.15" - gem "coveralls", :require => false gem "erb_lint", :require => false gem "factory_bot_rails" gem "minitest", "~> 5.1" gem "puma", "~> 5.0" gem "rails-controller-testing" - gem "rubocop", "~> 0.93" + gem "rubocop" gem "rubocop-minitest" gem "rubocop-performance" gem "rubocop-rails" gem "selenium-webdriver" + gem "simplecov", :require => false + gem "simplecov-lcov", :require => false gem "webmock" end diff --git a/Gemfile.lock b/Gemfile.lock index 61fe25c09..59cfa8804 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,6 @@ GEM remote: https://rubygems.org/ specs: - SystemTimer (1.2.3) aasm (5.1.1) concurrent-ruby (~> 1.0) actioncable (6.0.3.4) @@ -71,19 +70,19 @@ GEM activerecord (>= 3.2, < 7.0) rake (>= 10.4, < 14.0) ast (2.4.1) - autoprefixer-rails (10.0.3.0) + autoprefixer-rails (10.2.0.0) execjs aws-eventstream (1.1.0) - aws-partitions (1.402.0) + aws-partitions (1.415.0) aws-sdk-core (3.110.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.39.0) + aws-sdk-kms (1.40.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.86.0) + aws-sdk-s3 (1.87.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -101,8 +100,7 @@ GEM html_tokenizer (~> 0.0.6) parser (>= 2.4) smart_properties - bigdecimal (1.1.0) - binding_of_caller (0.8.0) + binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) bootsnap (1.5.1) msgpack (~> 1.0) @@ -113,14 +111,14 @@ GEM bootstrap_form (4.5.0) actionpack (>= 5.2) activemodel (>= 5.2) - brakeman (4.10.0) - browser (5.1.0) + brakeman (4.10.1) + browser (5.2.0) builder (3.2.4) bzip2-ffi (1.0.0) ffi (~> 1.0) - cancancan (3.1.0) - canonical-rails (0.2.9) - rails (>= 4.1, < 6.1) + cancancan (3.2.1) + canonical-rails (0.2.11) + rails (>= 4.1, < 6.2) capybara (3.34.0) addressable mini_mime (>= 0.1.3) @@ -131,45 +129,38 @@ GEM xpath (~> 3.2) childprocess (3.0.0) coderay (1.1.3) - composite_primary_keys (12.0.3) + composite_primary_keys (12.0.6) activerecord (~> 6.0.0) concurrent-ruby (1.1.7) - config (2.2.1) + config (2.2.3) deep_merge (~> 1.2, >= 1.2.1) dry-validation (~> 1.0, >= 1.0.0) - coveralls (0.8.23) - json (>= 1.8, < 3) - simplecov (~> 0.16.1) - term-ansicolor (~> 1.3) - thor (>= 0.19.4, < 2.0) - tins (~> 1.6) - crack (0.4.4) + crack (0.4.5) + rexml crass (1.0.6) dalli (2.7.11) debug_inspector (0.0.3) deep_merge (1.2.1) - delayed_job (4.1.8) - activesupport (>= 3.0, < 6.1) - delayed_job_active_record (4.1.4) - activerecord (>= 3.0, < 6.1) + delayed_job (4.1.9) + activesupport (>= 3.0, < 6.2) + delayed_job_active_record (4.1.5) + activerecord (>= 3.0, < 6.2) delayed_job (>= 3.0, < 5) - docile (1.3.2) - dry-configurable (0.11.6) + docile (1.3.4) + dry-configurable (0.12.0) concurrent-ruby (~> 1.0) - dry-core (~> 0.4, >= 0.4.7) - dry-equalizer (~> 0.2) + dry-core (~> 0.5, >= 0.5.0) dry-container (0.7.2) concurrent-ruby (~> 1.0) dry-configurable (~> 0.1, >= 0.1.3) - dry-core (0.4.10) + dry-core (0.5.0) concurrent-ruby (~> 1.0) dry-equalizer (0.3.0) dry-inflector (0.2.0) dry-initializer (3.0.4) - dry-logic (1.0.8) + dry-logic (1.1.0) concurrent-ruby (~> 1.0) - dry-core (~> 0.2) - dry-equalizer (~> 0.2) + dry-core (~> 0.5, >= 0.5) dry-schema (1.5.6) concurrent-ruby (~> 1.0) dry-configurable (~> 0.8, >= 0.8.3) @@ -193,13 +184,13 @@ GEM dry-initializer (~> 3.0) dry-schema (~> 1.5, >= 1.5.2) dynamic_form (1.1.4) - erb_lint (0.0.35) + erb_lint (0.0.36) activesupport better_html (~> 1.0.7) html_tokenizer parser (>= 2.7.1.4) rainbow - rubocop (~> 0.79) + rubocop smart_properties erubi (1.10.0) execjs (2.7.0) @@ -209,10 +200,12 @@ GEM factory_bot_rails (6.1.0) factory_bot (~> 6.1.0) railties (>= 5.0.0) - faraday (1.1.0) + faraday (1.3.0) + faraday-net_http (~> 1.0) multipart-post (>= 1.2, < 3) ruby2_keywords - ffi (1.13.1) + faraday-net_http (1.0.0) + ffi (1.14.2) ffi-libarchive (1.0.4) ffi (~> 1.0) fspath (3.1.2) @@ -225,11 +218,11 @@ GEM html_tokenizer (0.0.7) htmlentities (4.3.4) http_accept_language (2.1.1) - i18n (1.8.5) + i18n (1.8.7) concurrent-ruby (~> 1.0) i18n-js (3.8.0) i18n (>= 0.6.6) - image_optim (0.27.1) + image_optim (0.28.0) exifr (~> 1.2, >= 1.2.2) fspath (~> 3.0) image_size (>= 1.5, < 3) @@ -248,19 +241,17 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.3.1) + json (2.5.1) jwt (2.2.2) kgio (2.11.3) kramdown (2.3.0) rexml libxml-ruby (3.2.1) - listen (3.3.3) + listen (3.4.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - logstash-event (1.2.02) - logstasher (1.3.0) - activesupport (>= 4.0) - logstash-event (~> 1.2.0) + logstasher (2.1.5) + activesupport (>= 5.2) request_store loofah (2.8.0) crass (~> 1.0.2) @@ -274,15 +265,16 @@ GEM mimemagic (0.3.5) mini_magick (4.11.0) mini_mime (1.0.2) - mini_portile2 (2.4.0) - minitest (5.14.2) + mini_portile2 (2.5.0) + minitest (5.14.3) msgpack (1.3.3) multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.1.1) nio4r (2.5.4) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) + nokogiri (1.11.1) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) nokogumbo (2.0.4) nokogiri (~> 1.8, >= 1.8.4) oauth (0.4.7) @@ -305,8 +297,9 @@ GEM omniauth-github (1.4.0) omniauth (~> 1.5) omniauth-oauth2 (>= 1.4.0, < 2.0) - omniauth-google-oauth2 (0.8.0) + omniauth-google-oauth2 (0.8.1) jwt (>= 2.0) + oauth2 (~> 1.1) omniauth (>= 1.1.1) omniauth-oauth2 (>= 1.6) omniauth-mediawiki (0.0.4) @@ -326,17 +319,17 @@ GEM omniauth-oauth2 (~> 1.4) openstreetmap-deadlock_retry (1.3.0) parallel (1.20.1) - parser (2.7.2.0) + parser (3.0.0.0) ast (~> 2.4.1) pg (1.2.3) popper_js (1.16.0) progress (3.5.2) - psych (3.2.0) public_suffix (4.0.6) - puma (5.1.0) + puma (5.1.1) nio4r (~> 2.0) quad_tile (1.0.1) r2 (0.2.7) + racc (1.5.2) rack (2.2.3) rack-cors (1.1.1) rack (>= 2.0.0) @@ -380,7 +373,7 @@ GEM rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) rainbow (3.0.0) - rake (13.0.1) + rake (13.0.3) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) @@ -390,31 +383,31 @@ GEM rexml (3.2.4) rinku (2.0.6) rotp (6.2.0) - rubocop (0.93.1) + rubocop (1.8.1) parallel (~> 1.10) - parser (>= 2.7.1.5) + parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8) + regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 0.6.0) + rubocop-ast (>= 1.2.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (1.3.0) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.4.0) parser (>= 2.7.1.5) - rubocop-minitest (0.10.1) - rubocop (>= 0.87) - rubocop-performance (1.9.1) + rubocop-minitest (0.10.2) + rubocop (>= 0.87, < 2.0) + rubocop-performance (1.9.2) rubocop (>= 0.90.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.8.1) + rubocop-rails (2.9.1) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 0.87.0) + rubocop (>= 0.90.0, < 2.0) ruby-openid (2.9.2) - ruby-progressbar (1.10.1) + ruby-progressbar (1.11.0) ruby2_keywords (0.0.2) rubyzip (2.3.0) - sanitize (5.2.1) + sanitize (5.2.2) crass (~> 1.0.2) nokogiri (>= 1.8.0) nokogumbo (~> 2.0) @@ -430,11 +423,13 @@ GEM selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) - simplecov (0.16.1) + simplecov (0.21.2) docile (~> 1.1) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.2) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.12.3) + simplecov-lcov (0.8.0) + simplecov_json_formatter (0.1.2) smart_properties (1.15.0) sprockets (4.0.2) concurrent-ruby (~> 1.0) @@ -443,25 +438,20 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - strong_migrations (0.7.3) + strong_migrations (0.7.4) activerecord (>= 5) - sync (0.5.0) - term-ansicolor (1.7.1) - tins (~> 1.0) thor (1.0.1) thread_safe (0.3.6) tilt (2.0.10) - tins (1.26.0) - sync - tzinfo (1.2.8) + tzinfo (1.2.9) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unicode-display_width (1.7.0) + unicode-display_width (2.0.0) validates_email_format_of (1.6.3) i18n vendorer (0.2.0) - webmock (3.10.0) + webmock (3.11.0) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -476,7 +466,6 @@ PLATFORMS ruby DEPENDENCIES - SystemTimer (>= 1.1.3) aasm actionpack-page_caching (>= 1.2.0) active_record_union @@ -485,7 +474,6 @@ DEPENDENCIES autoprefixer-rails aws-sdk-s3 better_errors - bigdecimal (~> 1.1.0) binding_of_caller bootsnap (>= 1.4.2) bootstrap (~> 4.5.0) @@ -498,8 +486,8 @@ DEPENDENCIES capybara (>= 2.15) composite_primary_keys (~> 12.0.0) config - coveralls dalli + debug_inspector (< 1.0.0) delayed_job_active_record dynamic_form erb_lint @@ -533,7 +521,6 @@ DEPENDENCIES omniauth-windowslive openstreetmap-deadlock_retry (>= 1.3.0) pg - psych puma (~> 5.0) quad_tile (~> 1.0.1) r2 (~> 0.2.7) @@ -544,7 +531,7 @@ DEPENDENCIES rails-i18n (~> 6.0.0) rinku (>= 2.0.6) rotp - rubocop (~> 0.93) + rubocop rubocop-minitest rubocop-performance rubocop-rails @@ -552,6 +539,8 @@ DEPENDENCIES sassc-rails secure_headers selenium-webdriver + simplecov + simplecov-lcov strong_migrations uglifier (>= 1.3.0) validates_email_format_of (>= 1.5.1) diff --git a/README.md b/README.md index 81b8ce7bf..b96a77671 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # "The Rails Port" -[![Build Status](https://travis-ci.org/openstreetmap/openstreetmap-website.svg?branch=master)](https://travis-ci.org/openstreetmap/openstreetmap-website) +[![Lint](https://github.com/openstreetmap/openstreetmap-website/workflows/Lint/badge.svg?branch=master&event=push)](https://github.com/openstreetmap/openstreetmap-website/actions?query=workflow%3ALint%20branch%3Amaster%20event%3Apush) +[![Tests](https://github.com/openstreetmap/openstreetmap-website/workflows/Tests/badge.svg?branch=master&event=push)](https://github.com/openstreetmap/openstreetmap-website/actions?query=workflow%3ATests%20branch%3Amaster%20event%3Apush) [![Coverage Status](https://coveralls.io/repos/openstreetmap/openstreetmap-website/badge.svg?branch=master)](https://coveralls.io/r/openstreetmap/openstreetmap-website?branch=master) This is The Rails Port, the [Ruby on Rails](http://rubyonrails.org/) @@ -11,7 +12,7 @@ This repository consists of: * The web site, including user accounts, diary entries, user-to-user messaging. * The XML-based editing [API](https://wiki.openstreetmap.org/wiki/API_v0.6). -* The integrated versions of the [Potlatch](https://wiki.openstreetmap.org/wiki/Potlatch_1), [Potlatch 2](https://wiki.openstreetmap.org/wiki/Potlatch_2) and [iD](https://wiki.openstreetmap.org/wiki/ID) editors. +* The integrated version of the [iD](https://wiki.openstreetmap.org/wiki/ID) editors. * The Browse pages - a web front-end to the OpenStreetMap data. * The GPX uploads, browsing and API. diff --git a/Vagrantfile b/Vagrantfile index 271c0b3f5..2ef899123 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -6,7 +6,7 @@ Vagrant.configure("2") do |config| config.vm.provider "virtualbox" do |vb, override| override.vm.box = "ubuntu/focal64" override.vm.synced_folder ".", "/srv/openstreetmap-website" - vb.customize ["modifyvm", :id, "--memory", "1024"] + vb.customize ["modifyvm", :id, "--memory", "4096"] vb.customize ["modifyvm", :id, "--cpus", "2"] vb.customize ["modifyvm", :id, "--uartmode1", "disconnected"] end diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js index 97d6f8b98..8d66a7fef 100644 --- a/app/assets/config/manifest.js +++ b/app/assets/config/manifest.js @@ -19,12 +19,6 @@ //= link_directory ../../../vendor/assets/polyfill .js -//= link_directory ../../../vendor/assets/potlatch2/help -//= link_tree ../../../vendor/assets/potlatch2 .swf -//= link_tree ../../../vendor/assets/potlatch2 .zip - -//= link_directory ../../../vendor/assets/swfobject - //= link html5shiv/dist/html5shiv.js //= link leaflet/dist/images/marker-icon.png diff --git a/app/assets/images/aol.png b/app/assets/images/aol.png deleted file mode 100644 index cf773f907..000000000 Binary files a/app/assets/images/aol.png and /dev/null differ diff --git a/app/assets/images/aol.svg b/app/assets/images/aol.svg new file mode 100644 index 000000000..53c4dadb7 --- /dev/null +++ b/app/assets/images/aol.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/images/facebook.png b/app/assets/images/facebook.png deleted file mode 100644 index 8a9efc970..000000000 Binary files a/app/assets/images/facebook.png and /dev/null differ diff --git a/app/assets/images/facebook.svg b/app/assets/images/facebook.svg new file mode 100644 index 000000000..1968745b2 --- /dev/null +++ b/app/assets/images/facebook.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/images/github.png b/app/assets/images/github.png deleted file mode 100644 index b797e243a..000000000 Binary files a/app/assets/images/github.png and /dev/null differ diff --git a/app/assets/images/github.svg b/app/assets/images/github.svg new file mode 100644 index 000000000..79fa0cb13 --- /dev/null +++ b/app/assets/images/github.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/images/google.png b/app/assets/images/google.png deleted file mode 100644 index b273b6b6e..000000000 Binary files a/app/assets/images/google.png and /dev/null differ diff --git a/app/assets/images/google.svg b/app/assets/images/google.svg new file mode 100644 index 000000000..fecdd4d00 --- /dev/null +++ b/app/assets/images/google.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/images/wikipedia.png b/app/assets/images/wikipedia.png deleted file mode 100644 index 784c18477..000000000 Binary files a/app/assets/images/wikipedia.png and /dev/null differ diff --git a/app/assets/images/wikipedia.svg b/app/assets/images/wikipedia.svg new file mode 100644 index 000000000..7330ec7e3 --- /dev/null +++ b/app/assets/images/wikipedia.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/images/windowslive.png b/app/assets/images/windowslive.png deleted file mode 100644 index 8df253c2b..000000000 Binary files a/app/assets/images/windowslive.png and /dev/null differ diff --git a/app/assets/images/windowslive.svg b/app/assets/images/windowslive.svg new file mode 100644 index 000000000..fdc0cbd76 --- /dev/null +++ b/app/assets/images/windowslive.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/images/wordpress.png b/app/assets/images/wordpress.png deleted file mode 100644 index dd7147c74..000000000 Binary files a/app/assets/images/wordpress.png and /dev/null differ diff --git a/app/assets/images/wordpress.svg b/app/assets/images/wordpress.svg new file mode 100644 index 000000000..d4ff7f03d --- /dev/null +++ b/app/assets/images/wordpress.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/images/yahoo.png b/app/assets/images/yahoo.png deleted file mode 100644 index 2a9c4a4f3..000000000 Binary files a/app/assets/images/yahoo.png and /dev/null differ diff --git a/app/assets/images/yahoo.svg b/app/assets/images/yahoo.svg new file mode 100644 index 000000000..b0bbdef73 --- /dev/null +++ b/app/assets/images/yahoo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/javascripts/edit/potlatch.js.erb b/app/assets/javascripts/edit/potlatch.js.erb deleted file mode 100644 index d55d2eab2..000000000 --- a/app/assets/javascripts/edit/potlatch.js.erb +++ /dev/null @@ -1,61 +0,0 @@ -//= require swfobject - -$(document).ready(function () { - window.changesaved = true; - - window.markChanged = function (saved) { - window.changesaved = saved; - } - - $(window).on("beforeunload", function() { - if (!window.changesaved) { - return I18n.t("site.edit.potlatch_unsaved_changes"); - } - }); - - window.updatelinks = function (lon, lat, zoom, layers, minlon, minlat, maxlon, maxlat, object) { - var hash = OSM.formatHash({ lon: lon, lat: lat, zoom: zoom }); - - if (hash !== location.hash) { - location.replace(hash); - } - - updateLinks({ lon: lon, lat: lat }, zoom); - } - - var potlatch = $("#potlatch"), - urlparams = OSM.params(), - potlatch_swf = <%= asset_path("potlatch/potlatch.swf").to_json %>, - install_swf = <%= asset_path("expressInstall.swf").to_json %>, - flashvars = {}, - params = {}, - attributes = {}; - - flashvars.winie = document.all && window.print ? true : false; - flashvars.token = potlatch.data("token"); - - if (potlatch.data("lat") && potlatch.data("lon")) { - flashvars.lat = potlatch.data("lat"); - flashvars.long = potlatch.data("lon"); - flashvars.scale = potlatch.data("zoom"); - } else { - var mapParams = OSM.mapParams(); - - flashvars.lat = mapParams.lat; - flashvars.long = mapParams.lon; - flashvars.scale = mapParams.zoom || 17; - } - - if (flashvars.scale < 11) flashvars.scale = 11; - - if (urlparams.gpx) flashvars.gpx = urlparams.gpx; - if (urlparams.way) flashvars.way = urlparams.way; - if (urlparams.node) flashvars.node = urlparams.node; - if (urlparams.custombg) flashvars.custombg = urlparams.custombg; - - attributes.id = "potlatch"; - attributes.bgcolor = "#FFFFFF"; - - swfobject.embedSWF(potlatch_swf, "potlatch", "100%", "100%", "6", - install_swf, flashvars, params, attributes); -}); diff --git a/app/assets/javascripts/edit/potlatch2.js.erb b/app/assets/javascripts/edit/potlatch2.js.erb deleted file mode 100644 index d5c6ecd7d..000000000 --- a/app/assets/javascripts/edit/potlatch2.js.erb +++ /dev/null @@ -1,83 +0,0 @@ -//= require swfobject - -$(document).ready(function () { - window.changesaved = true; - - window.markChanged = function (saved) { - window.changesaved = saved; - } - - $(window).on("beforeunload", function() { - if (!window.changesaved) { - return I18n.t("site.edit.potlatch2_unsaved_changes"); - } - }); - - window.mapMoved = $.throttle(250, function(lon, lat, zoom) { - var hash = OSM.formatHash({ lon: lon, lat: lat, zoom: zoom }); - - if (hash !== location.hash) { - location.replace(hash); - } - - updateLinks({ lon: lon, lat: lat }, zoom); - }); - - var potlatch = $("#potlatch"), - urlparams = OSM.params(), - potlatch_swf = <%= asset_path("potlatch2.swf").to_json %>, - install_swf = <%= asset_path("expressInstall.swf").to_json %>, - flashvars = {}, - params = {}; - attributes = {}; - - if (potlatch.data("lat") && potlatch.data("lon")) { - flashvars.lat = potlatch.data("lat"); - flashvars.lon = potlatch.data("lon"); - flashvars.zoom = potlatch.data("zoom"); - } else { - var mapParams = OSM.mapParams(); - - flashvars.lat = mapParams.lat; - flashvars.lon = mapParams.lon; - flashvars.zoom = mapParams.zoom || 17; - } - - if (potlatch.data("token")) { - flashvars.oauth_token = potlatch.data("token"); - flashvars.oauth_token_secret = potlatch.data("token-secret"); - flashvars.oauth_consumer_key = potlatch.data("consumer-key"); - flashvars.oauth_consumer_secret = potlatch.data("consumer-secret"); - } else { - alert(I18n.t("site.edit.potlatch2_not_configured")); - } - - flashvars.assets = <%= asset_path("potlatch2/assets.zip").to_json %>; - flashvars.font_library = <%= asset_path("potlatch2/FontLibrary.swf").to_json %>; - flashvars.locale = potlatch.data("locale"); - flashvars.locale_paths = potlatch.data("locale") + "=" + potlatch.data("locale-path"); - flashvars.intro_image = <%= asset_path("help/introduction.jpg").to_json %>; - flashvars.intro_video = <%= asset_path("help/introduction.mp4").to_json %>; - if (urlparams.gpx) flashvars.gpx = urlparams.gpx; - if (urlparams.tileurl) flashvars.tileurl = urlparams.tileurl; - flashvars.api = location.protocol + "//" + location.host + "/api/" + OSM.API_VERSION + "/"; - flashvars.policy = location.protocol + "//" + location.host + "/api/crossdomain.xml"; - flashvars.connection = "XML"; - flashvars.show_help = "once"; - flashvars.user_check = "warn"; - flashvars.maximise_function = "maximiseMap"; - flashvars.minimise_function = "minimiseMap"; - flashvars.move_function = "mapMoved"; - - params.base = "/potlatch2"; - - attributes.id = "potlatch"; - attributes.bgcolor = "#FFFFFF"; - - swfobject.embedSWF(potlatch_swf, "potlatch", "100%", "100%", "10.1.102", - install_swf, flashvars, params, attributes); - - if (flashvars.lat && flashvars.lon) { - updateLinks({ lon: flashvars.lon, lat: flashvars.lat }, flashvars.scale); - } -}); diff --git a/app/assets/javascripts/id.js b/app/assets/javascripts/id.js index 889a39f86..ac18da06f 100644 --- a/app/assets/javascripts/id.js +++ b/app/assets/javascripts/id.js @@ -8,7 +8,7 @@ document.addEventListener("DOMContentLoaded", function () { if (typeof iD === "undefined" || !iD.utilDetect().support) { container.innerHTML = "This editor is supported " + "in Firefox, Chrome, Safari, Opera, Edge, and Internet Explorer 11. " + - "Please upgrade your browser or use Potlatch 2 to edit the map."; + "Please upgrade your browser or use JOSM to edit the map."; container.className = "unsupported"; } else { var id = iD.coreContext() diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 8aee535af..0998b94a9 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -1273,16 +1273,10 @@ tr.turn:hover { } } -.pagination { - padding-top: $lineheight; -} - /* Rules for the diary entry page */ .diary_entries { #map { - position: relative; - width: 90%; height: 400px; border: 1px solid $grey; display: none; @@ -1324,7 +1318,7 @@ tr.turn:hover { .diary-subscribe-buttons { - position:relative; + position: relative; top: -30px; left: 130px; } @@ -1333,11 +1327,11 @@ tr.turn:hover { #login_auth_buttons { margin-bottom: 0; -} -#login_auth_buttons li { - float: left; - padding: $lineheight/4 $lineheight/2; + li { + float: left; + padding: $lineheight/4 $lineheight/2; + } } /* Rules for the account confirmation page */ @@ -1978,80 +1972,82 @@ div.secondary-actions { /* Rules for rich text editors */ -input.richtext_title[type="text"] { - width: 50%; - width: calc(100% - 235px); - - @media only screen and (max-width:768px) { - width: 100%; - } -} - -.richtext_container { - margin-bottom: $lineheight; - - .richtext_content { +.standard-form { + input.richtext_title[type="text"] { width: 50%; width: calc(100% - 235px); - display: inline-block; - vertical-align: top; @media only screen and (max-width:768px) { width: 100%; } + } - .richtext_preview { + .richtext_container { + margin-bottom: $lineheight; + + .richtext_content { + width: 50%; + width: calc(100% - 235px); display: inline-block; - padding: $lineheight; - background-color: $offwhite; - overflow-x: auto; + vertical-align: top; - &.loading { - background-image: image-url("loading.gif"); - background-repeat: no-repeat; - background-position: center; + @media only screen and (max-width:768px) { + width: 100%; } - > :first-child { - margin-top: 0px; - } - } - } + .richtext_preview { + display: inline-block; + padding: $lineheight; + background-color: $offwhite; + overflow-x: auto; - .richtext_help { - display: inline-block; - vertical-align: top; - margin-left: 15px; - background-color: $offwhite; - padding: $lineheight/2; - width: 220px; - - ul { - margin-bottom: 0; - } + &.loading { + background-image: image-url("loading.gif"); + background-repeat: no-repeat; + background-position: center; + } - h4.heading, li { - border-bottom: 1px solid $grey; - margin-bottom: $lineheight/4; - padding-bottom: $lineheight/4; + > :first-child { + margin-top: 0px; + } + } } - li h4, li span, li p { + .richtext_help { display: inline-block; vertical-align: top; - font-size: 11px; - } + margin-left: 15px; + background-color: $offwhite; + padding: $lineheight/2; + width: 220px; - li h4 { - width: 40%; - margin: 0; - } + ul { + margin-bottom: 0; + } - li span, li p { - width: 50%; - margin-left: $lineheight/2; - margin-bottom: $lineheight/4; - white-space: nowrap; + h4.heading, li { + border-bottom: 1px solid $grey; + margin-bottom: $lineheight/4; + padding-bottom: $lineheight/4; + } + + li h4, li span, li p { + display: inline-block; + vertical-align: top; + font-size: 11px; + } + + li h4 { + width: 40%; + margin: 0; + } + + li span, li p { + width: 50%; + margin-left: $lineheight/2; + margin-bottom: $lineheight/4; + white-space: nowrap; + } } } } diff --git a/app/controllers/api/amf_controller.rb b/app/controllers/api/amf_controller.rb deleted file mode 100644 index 5d45eb070..000000000 --- a/app/controllers/api/amf_controller.rb +++ /dev/null @@ -1,999 +0,0 @@ -# amf_controller is a semi-standalone API for Flash clients, particularly -# Potlatch. All interaction between Potlatch (as a .SWF application) and the -# OSM database takes place using this controller. Messages are -# encoded in the Actionscript Message Format (AMF). -# -# Helper functions are in /lib/potlatch.rb -# -# Author:: editions Systeme D / Richard Fairhurst 2004-2008 -# Licence:: public domain. -# -# == General structure -# -# Apart from the amf_read and amf_write methods (which distribute the requests -# from the AMF message), each method generally takes arguments in the order -# they were sent by the Potlatch SWF. Do not assume typing has been preserved. -# Methods all return an array to the SWF. -# -# == API 0.6 -# -# Note that this requires a patched version of composite_primary_keys 1.1.0 -# (see http://groups.google.com/group/compositekeys/t/a00e7562b677e193) -# if you are to run with POTLATCH_USE_SQL=false . -# -# == Debugging -# -# Any method that returns a status code (0 for ok) can also send: -# return(-1,"message") <-- just puts up a dialogue -# return(-2,"message") <-- also asks the user to e-mail me -# return(-3,["type",v],id) <-- version conflict -# return(-4,"type",id) <-- object not found -# -5 indicates the method wasn't called (due to a previous error) -# -# To write to the Rails log, use logger.info("message"). - -# Remaining issues: -# * version conflict when POIs and ways are reverted - -module Api - class AmfController < ApiController - include Potlatch - - before_action :check_api_writable - - # AMF Controller implements its own authentication and authorization checks - # completely independently of the rest of the codebase, so best just to let - # it keep doing its own thing. - skip_authorization_check - - # Main AMF handlers: process the raw AMF string (using AMF library) and - # calls each action (private method) accordingly. - - def amf_read - self.status = :ok - self.content_type = Mime[:amf] - self.response_body = Dispatcher.new(request.raw_post) do |message, *args| - logger.info("Executing AMF #{message}(#{args.join(',')})") - - case message - when "getpresets" then result = getpresets(*args) - when "whichways" then result = whichways(*args) - when "whichways_deleted" then result = whichways_deleted(*args) - when "getway" then result = getway(args[0].to_i) - when "getrelation" then result = getrelation(args[0].to_i) - when "getway_old" then result = getway_old(args[0].to_i, args[1]) - when "getway_history" then result = getway_history(args[0].to_i) - when "getnode_history" then result = getnode_history(args[0].to_i) - when "findgpx" then result = findgpx(*args) - when "findrelations" then result = findrelations(*args) - when "getpoi" then result = getpoi(*args) - end - - result - end - end - - def amf_write - renumberednodes = {} # Shared across repeated putways - renumberedways = {} # Shared across repeated putways - err = false # Abort batch on error - - self.status = :ok - self.content_type = Mime[:amf] - self.response_body = Dispatcher.new(request.raw_post) do |message, *args| - logger.info("Executing AMF #{message}") - - if err - result = [-5, nil] - else - case message - when "putway" - orn = renumberednodes.dup - result = putway(renumberednodes, *args) - result[4] = renumberednodes.reject { |k, _v| orn.key?(k) } - renumberedways[result[2]] = result[3] if result[0].zero? && result[2] != result[3] - when "putrelation" - result = putrelation(renumberednodes, renumberedways, *args) - when "deleteway" - result = deleteway(*args) - when "putpoi" - result = putpoi(*args) - renumberednodes[result[2]] = result[3] if result[0].zero? && result[2] != result[3] - when "startchangeset" - result = startchangeset(*args) - end - - err = true if result[0] == -3 # If a conflict is detected, don't execute any more writes - end - - result - end - end - - private - - def amf_handle_error(call, rootobj, rootid) - yield - rescue OSM::APIAlreadyDeletedError => e - [-4, e.object, e.object_id] - rescue OSM::APIVersionMismatchError => e - [-3, [rootobj, rootid], [e.type.downcase, e.id, e.latest]] - rescue OSM::APIUserChangesetMismatchError => e - [-2, e.to_s] - rescue OSM::APIBadBoundingBox => e - [-2, "Sorry - I can't get the map for that area. The server said: #{e}"] - rescue OSM::APIError => e - [-1, e.to_s] - rescue StandardError => e - [-2, "An unusual error happened (in #{call}). The server said: #{e}"] - end - - def amf_handle_error_with_timeout(call, rootobj, rootid, &block) - amf_handle_error(call, rootobj, rootid) do - OSM::Timer.timeout(Settings.api_timeout, OSM::APITimeoutError, &block) - end - end - - # Start new changeset - # Returns success_code,success_message,changeset id - - def startchangeset(usertoken, cstags, closeid, closecomment, opennew) - amf_handle_error("'startchangeset'", nil, nil) do - user = getuser(usertoken) - return -1, "You are not logged in, so Potlatch can't write any changes to the database." unless user - return -1, t("application.setup_user_auth.blocked") if user.blocks.active.exists? - return -1, "You must accept the contributor terms before you can edit." if user.terms_agreed.nil? - - if cstags - return -1, "One of the tags is invalid. Linux users may need to upgrade to Flash Player 10.1." unless tags_ok(cstags) - - cstags = strip_non_xml_chars cstags - end - - # close previous changeset and add comment - if closeid - cs = Changeset.find(closeid.to_i) - cs.set_closed_time_now - if cs.user_id != user.id - raise OSM::APIUserChangesetMismatchError - elsif closecomment.empty? - cs.save! - else - cs.tags["comment"] = closecomment - # in case closecomment has chars not allowed in xml - cs.tags = strip_non_xml_chars cs.tags - cs.save_with_tags! - end - end - - # open a new changeset - if opennew.nonzero? - cs = Changeset.new - cs.tags = cstags - cs.user_id = user.id - unless closecomment.empty? - cs.tags["comment"] = closecomment - # in case closecomment has chars not allowed in xml - cs.tags = strip_non_xml_chars cs.tags - end - # smsm1 doesn't like the next two lines and thinks they need to be abstracted to the model more/better - cs.created_at = Time.now.getutc - cs.closed_at = cs.created_at + Changeset::IDLE_TIMEOUT - cs.save_with_tags! - return [0, "", cs.id] - else - return [0, "", nil] - end - end - end - - # Return presets (default tags, localisation etc.): - # uses POTLATCH_PRESETS global, set up in OSM::Potlatch. - - def getpresets(usertoken, _lang) - user = getuser(usertoken) - - langs = if user && !user.languages.empty? - Locale.list(user.languages) - else - Locale.list(http_accept_language.user_preferred_languages) - end - - lang = getlocales.preferred(langs) - (real_lang, localised) = getlocalized(lang.to_s) - - # Tell Potlatch what language it's using - localised["__potlatch_locale"] = real_lang - - # Get help from i18n but delete it so we won't pass it around - # twice for nothing - help = localised["help_html"] - localised.delete("help_html") - - # Populate icon names - POTLATCH_PRESETS[10].each do |id| - POTLATCH_PRESETS[11][id] = localised["preset_icon_#{id}"] - localised.delete("preset_icon_#{id}") - end - - POTLATCH_PRESETS + [localised, help] - end - - def getlocalized(lang) - # What we end up actually using. Reported in Potlatch's created_by=* string - loaded_lang = "en" - - # Load English defaults - en = YAML.safe_load(File.open(Rails.root.join("config/potlatch/locales/en.yml")))["en"] - - if lang == "en" - [loaded_lang, en] - else - # Use English as a fallback - begin - other = YAML.safe_load(File.open(Rails.root.join("config/potlatch/locales/#{lang}.yml")))[lang] - loaded_lang = lang - rescue StandardError - other = en - end - - # We have to return a flat list and some of the keys won't be - # translated (probably) - [loaded_lang, en.merge(other)] - end - end - - ## - # Find all the ways, POI nodes (i.e. not part of ways), and relations - # in a given bounding box. Nodes are returned in full; ways and relations - # are IDs only. - # - # return is of the form: - # [success_code, success_message, - # [[way_id, way_version], ...], - # [[node_id, lat, lon, [tags, ...], node_version], ...], - # [[rel_id, rel_version], ...]] - # where the ways are any visible ways which refer to any visible - # nodes in the bbox, nodes are any visible nodes in the bbox but not - # used in any way, rel is any relation which refers to either a way - # or node that we're returning. - def whichways(xmin, ymin, xmax, ymax) - amf_handle_error_with_timeout("'whichways'", nil, nil) do - enlarge = [(xmax - xmin) / 8, 0.01].min - xmin -= enlarge - ymin -= enlarge - xmax += enlarge - ymax += enlarge - - # check boundary is sane and area within defined - # see /config/application.yml - bbox = BoundingBox.new(xmin, ymin, xmax, ymax) - bbox.check_boundaries - bbox.check_size - - if POTLATCH_USE_SQL - ways = sql_find_ways_in_area(bbox) - points = sql_find_pois_in_area(bbox) - relations = sql_find_relations_in_area_and_ways(bbox, ways.collect { |x| x[0] }) - else - # find the way ids in an area - nodes_in_area = Node.bbox(bbox).visible.includes(:ways) - ways = nodes_in_area.inject([]) do |sum, node| - visible_ways = node.ways.select(&:visible?) - sum + visible_ways.collect { |w| [w.id, w.version] } - end.uniq - ways.delete([]) - - # find the node ids in an area that aren't part of ways - nodes_not_used_in_area = nodes_in_area.select { |node| node.ways.empty? } - points = nodes_not_used_in_area.collect { |n| [n.id, n.lon, n.lat, n.tags, n.version] }.uniq - - # find the relations used by those nodes and ways - relations = Relation.nodes(nodes_in_area.collect(&:id)).visible + - Relation.ways(ways.collect { |w| w[0] }).visible - relations = relations.collect { |relation| [relation.id, relation.version] }.uniq - end - - [0, "", ways, points, relations] - end - end - - # Find deleted ways in current bounding box (similar to whichways, but ways - # with a deleted node only - not POIs or relations). - - def whichways_deleted(xmin, ymin, xmax, ymax) - amf_handle_error_with_timeout("'whichways_deleted'", nil, nil) do - enlarge = [(xmax - xmin) / 8, 0.01].min - xmin -= enlarge - ymin -= enlarge - xmax += enlarge - ymax += enlarge - - # check boundary is sane and area within defined - # see /config/application.yml - bbox = BoundingBox.new(xmin, ymin, xmax, ymax) - bbox.check_boundaries - bbox.check_size - - nodes_in_area = Node.bbox(bbox).joins(:ways_via_history).where(:current_ways => { :visible => false }) - way_ids = nodes_in_area.collect { |node| node.ways_via_history.invisible.collect(&:id) }.flatten.uniq - - [0, "", way_ids] - end - end - - # Get a way including nodes and tags. - # Returns the way id, a Potlatch-style array of points, a hash of tags, the version number, and the user ID. - - def getway(wayid) - amf_handle_error_with_timeout("'getway' #{wayid}", "way", wayid) do - if POTLATCH_USE_SQL - points = sql_get_nodes_in_way(wayid) - tags = sql_get_tags_in_way(wayid) - version = sql_get_way_version(wayid) - uid = sql_get_way_user(wayid) - else - # Ideally we would do ":include => :nodes" here but if we do that - # then rails only seems to return the first copy of a node when a - # way includes a node more than once - way = Way.where(:id => wayid).first - - # check case where way has been deleted or doesn't exist - return [-4, "way", wayid] if way.nil? || !way.visible - - points = way.nodes.preload(:node_tags).collect do |node| - nodetags = node.tags - nodetags.delete("created_by") - [node.lon, node.lat, node.id, nodetags, node.version] - end - tags = way.tags - version = way.version - uid = way.changeset.user.id - end - - [0, "", wayid, points, tags, version, uid] - end - end - - # Get an old version of a way, and all constituent nodes. - # - # For undelete (version<0), always uses the most recent version of each node, - # even if it's moved. For revert (version >= 0), uses the node in existence - # at the time, generating a new id if it's still visible and has been moved/ - # retagged. - # - # Returns: - # 0. success code, - # 1. id, - # 2. array of points, - # 3. hash of tags, - # 4. version, - # 5. is this the current, visible version? (boolean) - - def getway_old(id, timestamp) - amf_handle_error_with_timeout("'getway_old' #{id}, #{timestamp}", "way", id) do - if timestamp == "" - # undelete - old_way = OldWay.where(:visible => true, :way_id => id).unredacted.order("version DESC").first - points = old_way.get_nodes_undelete unless old_way.nil? - else - begin - # revert - timestamp = Time.zone.strptime(timestamp.to_s, "%d %b %Y, %H:%M:%S") - old_way = OldWay.where("way_id = ? AND timestamp <= ?", id, timestamp).unredacted.order("timestamp DESC").first - unless old_way.nil? - if old_way.visible - points = old_way.get_nodes_revert(timestamp) - else - return [-1, "Sorry, the way was deleted at that time - please revert to a previous version.", id] - end - end - rescue ArgumentError - # thrown by date parsing method. leave old_way as nil for - # the error handler below. - old_way = nil - end - end - - if old_way.nil? - return [-1, "Sorry, the server could not find a way at that time.", id] - else - curway = Way.find(id) - old_way.tags["history"] = "Retrieved from v#{old_way.version}" - return [0, "", id, points, old_way.tags, curway.version, (curway.version == old_way.version && curway.visible)] - end - end - end - - # Find history of a way. - # Returns 'way', id, and an array of previous versions: - # - formerly [old_way.version, old_way.timestamp.strftime("%d %b %Y, %H:%M"), old_way.visible ? 1 : 0, user, uid] - # - now [timestamp,user,uid] - # - # Heuristic: Find all nodes that have ever been part of the way; - # get a list of their revision dates; add revision dates of the way; - # sort and collapse list (to within 2 seconds); trim all dates before the - # start date of the way. - - def getway_history(wayid) - revdates = [] - revusers = {} - Way.find(wayid).old_ways.unredacted.collect do |a| - revdates.push(a.timestamp) - revusers[a.timestamp.to_i] = change_user(a) unless revusers.key?(a.timestamp.to_i) - a.nds.each do |n| - Node.find(n).old_nodes.unredacted.collect do |o| - revdates.push(o.timestamp) - revusers[o.timestamp.to_i] = change_user(o) unless revusers.key?(o.timestamp.to_i) - end - end - end - waycreated = revdates[0] - revdates.uniq! - revdates.sort! - revdates.reverse! - - # Remove any dates (from nodes) before first revision date of way - revdates.delete_if { |d| d < waycreated } - # Remove any elements where 2 seconds doesn't elapse before next one - revdates.delete_if { |d| revdates.include?(d + 1) || revdates.include?(d + 2) } - # Collect all in one nested array - revdates.collect! { |d| [(d + 1).strftime("%d %b %Y, %H:%M:%S")] + revusers[d.to_i] } - revdates.uniq! - - ["way", wayid, revdates] - rescue ActiveRecord::RecordNotFound - ["way", wayid, []] - end - - # Find history of a node. Returns 'node', id, and an array of previous versions as above. - - def getnode_history(nodeid) - history = Node.find(nodeid).old_nodes.unredacted.reverse.collect do |old_node| - [(old_node.timestamp + 1).strftime("%d %b %Y, %H:%M:%S")] + change_user(old_node) - end - ["node", nodeid, history] - rescue ActiveRecord::RecordNotFound - ["node", nodeid, []] - end - - def change_user(obj) - user_object = obj.changeset.user - user = user_object.data_public? ? user_object.display_name : "anonymous" - uid = user_object.data_public? ? user_object.id : 0 - [user, uid] - end - - # Find GPS traces with specified name/id. - # Returns array listing GPXs, each one comprising id, name and description. - - def findgpx(searchterm, usertoken) - amf_handle_error_with_timeout("'findgpx'", nil, nil) do - user = getuser(usertoken) - - return -1, "You must be logged in to search for GPX traces." unless user - return -1, t("application.setup_user_auth.blocked") if user.blocks.active.exists? - - query = Trace.visible_to(user) - query = if searchterm.to_i.positive? - query.where(:id => searchterm.to_i) - else - query.where("MATCH(name) AGAINST (?)", searchterm).limit(21) - end - gpxs = query.collect do |gpx| - [gpx.id, gpx.name, gpx.description] - end - [0, "", gpxs] - end - end - - # Get a relation with all tags and members. - # Returns: - # 0. success code? - # 1. object type? - # 2. relation id, - # 3. hash of tags, - # 4. list of members, - # 5. version. - - def getrelation(relid) - amf_handle_error("'getrelation' #{relid}", "relation", relid) do - rel = Relation.where(:id => relid).first - - return [-4, "relation", relid] if rel.nil? || !rel.visible - - [0, "", relid, rel.tags, rel.members, rel.version] - end - end - - # Find relations with specified name/id. - # Returns array of relations, each in same form as getrelation. - - def findrelations(searchterm) - rels = [] - if searchterm.to_i.positive? - rel = Relation.where(:id => searchterm.to_i).first - rels.push([rel.id, rel.tags, rel.members, rel.version]) if rel&.visible - else - RelationTag.where("v like ?", "%#{searchterm}%").limit(11).each do |t| - rels.push([t.relation.id, t.relation.tags, t.relation.members, t.relation.version]) if t.relation.visible - end - end - rels - end - - # Save a relation. - # Returns - # 0. 0 (success), - # 1. original relation id (unchanged), - # 2. new relation id, - # 3. version. - - def putrelation(renumberednodes, renumberedways, usertoken, changeset_id, version, relid, tags, members, visible) - amf_handle_error("'putrelation' #{relid}", "relation", relid) do - user = getuser(usertoken) - - return -1, "You are not logged in, so the relation could not be saved." unless user - return -1, t("application.setup_user_auth.blocked") if user.blocks.active.exists? - return -1, "You must accept the contributor terms before you can edit." if user.terms_agreed.nil? - - return -1, "One of the tags is invalid. Linux users may need to upgrade to Flash Player 10.1." unless tags_ok(tags) - - tags = strip_non_xml_chars tags - - relid = relid.to_i - visible = visible.to_i.nonzero? - - new_relation = nil - relation = nil - Relation.transaction do - # create a new relation, or find the existing one - relation = Relation.find(relid) if relid.positive? - # We always need a new node, based on the data that has been sent to us - new_relation = Relation.new - - # check the members are all positive, and correctly type - typedmembers = [] - members.each do |m| - mid = m[1].to_i - if mid.negative? - mid = renumberednodes[mid] if m[0] == "Node" - mid = renumberedways[mid] if m[0] == "Way" - end - typedmembers << [m[0], mid, m[2].delete("\000-\037\ufffe\uffff", "^\011\012\015")] if mid - end - - # assign new contents - new_relation.members = typedmembers - new_relation.tags = tags - new_relation.visible = visible - new_relation.changeset_id = changeset_id.to_i - new_relation.version = version - - if relid <= 0 - # We're creating the relation - new_relation.create_with_history(user) - elsif visible - # We're updating the relation - new_relation.id = relid - relation.update_from(new_relation, user) - else - # We're deleting the relation - new_relation.id = relid - relation.delete_with_history!(new_relation, user) - end - end - - if relid <= 0 - return [0, "", relid, new_relation.id, new_relation.version] - else - return [0, "", relid, relid, relation.version] - end - end - end - - # Save a way to the database, including all nodes. Any nodes in the previous - # version and no longer used are deleted. - # - # Parameters: - # 0. hash of renumbered nodes (added by amf_controller) - # 1. current user token (for authentication) - # 2. current changeset - # 3. new way version - # 4. way ID - # 5. list of nodes in way - # 6. hash of way tags - # 7. array of nodes to change (each one is [lon,lat,id,version,tags]), - # 8. hash of nodes to delete (id->version). - # - # Returns: - # 0. '0' (code for success), - # 1. message, - # 2. original way id (unchanged), - # 3. new way id, - # 4. hash of renumbered nodes (old id=>new id), - # 5. way version, - # 6. hash of changed node versions (node=>version) - # 7. hash of deleted node versions (node=>version) - - def putway(renumberednodes, usertoken, changeset_id, wayversion, originalway, pointlist, attributes, nodes, deletednodes) - amf_handle_error("'putway' #{originalway}", "way", originalway) do - # -- Initialise - - user = getuser(usertoken) - return -1, "You are not logged in, so the way could not be saved." unless user - return -1, t("application.setup_user_auth.blocked") if user.blocks.active.exists? - return -1, "You must accept the contributor terms before you can edit." if user.terms_agreed.nil? - - return -2, "Server error - way is only #{pointlist.length} points long." if pointlist.length < 2 - - return -1, "One of the tags is invalid. Linux users may need to upgrade to Flash Player 10.1." unless tags_ok(attributes) - - attributes = strip_non_xml_chars attributes - - originalway = originalway.to_i - pointlist.collect!(&:to_i) - - way = nil # this is returned, so scope it outside the transaction - nodeversions = {} - Way.transaction do - # -- Update each changed node - - nodes.each do |a| - lon = a[0].to_f - lat = a[1].to_f - id = a[2].to_i - version = a[3].to_i - - return -2, "Server error - node with id 0 found in way #{originalway}." if id.zero? - return -2, "Server error - node with latitude -90 found in way #{originalway}." if lat == 90 - - id = renumberednodes[id] if renumberednodes[id] - - node = Node.new - node.changeset_id = changeset_id.to_i - node.lat = lat - node.lon = lon - node.tags = a[4] - - # fixup node tags in a way as well - return -1, "One of the tags is invalid. Linux users may need to upgrade to Flash Player 10.1." unless tags_ok(node.tags) - - node.tags = strip_non_xml_chars node.tags - - node.tags.delete("created_by") - node.version = version - if id <= 0 - # We're creating the node - node.create_with_history(user) - renumberednodes[id] = node.id - nodeversions[node.id] = node.version - else - # We're updating an existing node - previous = Node.find(id) - node.id = id - previous.update_from(node, user) - nodeversions[previous.id] = previous.version - end - end - - # -- Save revised way - - pointlist.collect! do |a| - renumberednodes[a] || a - end - new_way = Way.new - new_way.tags = attributes - new_way.nds = pointlist - new_way.changeset_id = changeset_id.to_i - new_way.version = wayversion - if originalway <= 0 - new_way.create_with_history(user) - way = new_way # so we can get way.id and way.version - else - way = Way.find(originalway) - if way.tags != attributes || way.nds != pointlist || !way.visible? - new_way.id = originalway - way.update_from(new_way, user) - end - end - - # -- Delete unwanted nodes - - deletednodes.each do |id, v| - node = Node.find(id.to_i) - new_node = Node.new - new_node.changeset_id = changeset_id.to_i - new_node.version = v.to_i - new_node.id = id.to_i - begin - node.delete_with_history!(new_node, user) - rescue OSM::APIPreconditionFailedError - # We don't do anything here as the node is being used elsewhere - # and we don't want to delete it - end - end - end - - [0, "", originalway, way.id, renumberednodes, way.version, nodeversions, deletednodes] - end - end - - # Save POI to the database. - # Refuses save if the node has since become part of a way. - # Returns array with: - # 0. 0 (success), - # 1. success message, - # 2. original node id (unchanged), - # 3. new node id, - # 4. version. - - def putpoi(usertoken, changeset_id, version, id, lon, lat, tags, visible) - amf_handle_error("'putpoi' #{id}", "node", id) do - user = getuser(usertoken) - return -1, "You are not logged in, so the point could not be saved." unless user - return -1, t("application.setup_user_auth.blocked") if user.blocks.active.exists? - return -1, "You must accept the contributor terms before you can edit." if user.terms_agreed.nil? - - return -1, "One of the tags is invalid. Linux users may need to upgrade to Flash Player 10.1." unless tags_ok(tags) - - tags = strip_non_xml_chars tags - - id = id.to_i - visible = (visible.to_i == 1) - node = nil - new_node = nil - Node.transaction do - if id.positive? - begin - node = Node.find(id) - rescue ActiveRecord::RecordNotFound - return [-4, "node", id] - end - - return -1, "Point #{id} has since become part of a way, so you cannot save it as a POI.", id, id, version unless visible || node.ways.empty? - end - # We always need a new node, based on the data that has been sent to us - new_node = Node.new - - new_node.changeset_id = changeset_id.to_i - new_node.version = version - new_node.lat = lat - new_node.lon = lon - new_node.tags = tags - if id <= 0 - # We're creating the node - new_node.create_with_history(user) - elsif visible - # We're updating the node - new_node.id = id - node.update_from(new_node, user) - else - # We're deleting the node - new_node.id = id - node.delete_with_history!(new_node, user) - end - end - - if id <= 0 - return [0, "", id, new_node.id, new_node.version] - else - return [0, "", id, node.id, node.version] - end - end - end - - # Read POI from database - # (only called on revert: POIs are usually read by whichways). - # - # Returns array of id, long, lat, hash of tags, (current) version. - - def getpoi(id, timestamp) - amf_handle_error("'getpoi' #{id}", "node", id) do - id = id.to_i - n = Node.where(:id => id).first - if n - v = n.version - n = OldNode.where("node_id = ? AND timestamp <= ?", id, timestamp).unredacted.order("timestamp DESC").first unless timestamp == "" - end - - if n - return [0, "", id, n.lon, n.lat, n.tags, v] - else - return [-4, "node", id] - end - end - end - - # Delete way and all constituent nodes. - # Params: - # * The user token - # * the changeset id - # * the id of the way to change - # * the version of the way that was downloaded - # * a hash of the id and versions of all the nodes that are in the way, if any - # of the nodes have been changed by someone else then, there is a problem! - # Returns 0 (success), unchanged way id, new way version, new node versions. - - def deleteway(usertoken, changeset_id, way_id, way_version, deletednodes) - amf_handle_error("'deleteway' #{way_id}", "way", way_id) do - user = getuser(usertoken) - return -1, "You are not logged in, so the way could not be deleted." unless user - return -1, t("application.setup_user_auth.blocked") if user.blocks.active.exists? - return -1, "You must accept the contributor terms before you can edit." if user.terms_agreed.nil? - - way_id = way_id.to_i - nodeversions = {} - old_way = nil # returned, so scope it outside the transaction - # Need a transaction so that if one item fails to delete, the whole delete fails. - Way.transaction do - # -- Delete the way - - old_way = Way.find(way_id) - delete_way = Way.new - delete_way.version = way_version - delete_way.changeset_id = changeset_id.to_i - delete_way.id = way_id - old_way.delete_with_history!(delete_way, user) - - # -- Delete unwanted nodes - - deletednodes.each do |id, v| - node = Node.find(id.to_i) - new_node = Node.new - new_node.changeset_id = changeset_id.to_i - new_node.version = v.to_i - new_node.id = id.to_i - begin - node.delete_with_history!(new_node, user) - nodeversions[node.id] = node.version - rescue OSM::APIPreconditionFailedError - # We don't do anything with the exception as the node is in use - # elsewhere and we don't want to delete it - end - end - end - [0, "", way_id, old_way.version, nodeversions] - end - end - - # ==================================================================== - # Support functions - - # Authenticate token - # (can also be of form user:pass) - # When we are writing to the api, we need the actual user model, - # not just the id, hence this abstraction - - def getuser(token) - if token =~ /^(.+):(.+)$/ - User.authenticate(:username => Regexp.last_match(1), :password => Regexp.last_match(2)) - else - User.authenticate(:token => token) - end - end - - def getlocales - @getlocales ||= Locale.list(Dir.glob(Rails.root.join("config/potlatch/locales/*")).collect { |f| File.basename(f, ".yml") }) - end - - ## - # check that all key-value pairs are valid UTF-8. - def tags_ok(tags) - tags.each do |k, v| - return false unless UTF8.valid? k - return false unless UTF8.valid? v - end - true - end - - ## - # strip characters which are invalid in XML documents from the strings - # in the +tags+ hash. - def strip_non_xml_chars(tags) - new_tags = {} - tags&.each do |k, v| - new_k = k.delete "\000-\037\ufffe\uffff", "^\011\012\015" - new_v = v.delete "\000-\037\ufffe\uffff", "^\011\012\015" - new_tags[new_k] = new_v - end - new_tags - end - - # ==================================================================== - # Alternative SQL queries for getway/whichways - - def sql_find_ways_in_area(bbox) - sql = <<~SQL.squish - SELECT DISTINCT current_ways.id AS wayid,current_ways.version AS version - FROM current_way_nodes - INNER JOIN current_nodes ON current_nodes.id=current_way_nodes.node_id - INNER JOIN current_ways ON current_ways.id =current_way_nodes.id - WHERE current_nodes.visible=TRUE - AND current_ways.visible=TRUE - AND #{OSM.sql_for_area(bbox, 'current_nodes.')} - SQL - ActiveRecord::Base.connection.select_all(sql).collect { |a| [a["wayid"].to_i, a["version"].to_i] } - end - - def sql_find_pois_in_area(bbox) - pois = [] - sql = <<~SQL.squish - SELECT current_nodes.id,current_nodes.latitude*0.0000001 AS lat,current_nodes.longitude*0.0000001 AS lon,current_nodes.version - FROM current_nodes - LEFT OUTER JOIN current_way_nodes cwn ON cwn.node_id=current_nodes.id - WHERE current_nodes.visible=TRUE - AND cwn.id IS NULL - AND #{OSM.sql_for_area(bbox, 'current_nodes.')} - SQL - ActiveRecord::Base.connection.select_all(sql).each do |row| - poitags = {} - ActiveRecord::Base.connection.select_all("SELECT k,v FROM current_node_tags WHERE id=#{row['id']}").each do |n| - poitags[n["k"]] = n["v"] - end - pois << [row["id"].to_i, row["lon"].to_f, row["lat"].to_f, poitags, row["version"].to_i] - end - pois - end - - def sql_find_relations_in_area_and_ways(bbox, way_ids) - # ** It would be more Potlatchy to get relations for nodes within ways - # during 'getway', not here - sql = <<~SQL.squish - SELECT DISTINCT cr.id AS relid,cr.version AS version - FROM current_relations cr - INNER JOIN current_relation_members crm ON crm.id=cr.id - INNER JOIN current_nodes cn ON crm.member_id=cn.id AND crm.member_type='Node' - WHERE #{OSM.sql_for_area(bbox, 'cn.')} - SQL - unless way_ids.empty? - sql += <<~SQL.squish - UNION - SELECT DISTINCT cr.id AS relid,cr.version AS version - FROM current_relations cr - INNER JOIN current_relation_members crm ON crm.id=cr.id - WHERE crm.member_type='Way' - AND crm.member_id IN (#{way_ids.join(',')}) - SQL - end - ActiveRecord::Base.connection.select_all(sql).collect { |a| [a["relid"].to_i, a["version"].to_i] } - end - - def sql_get_nodes_in_way(wayid) - points = [] - sql = <<~SQL.squish - SELECT latitude*0.0000001 AS lat,longitude*0.0000001 AS lon,current_nodes.id,current_nodes.version - FROM current_way_nodes,current_nodes - WHERE current_way_nodes.id=#{wayid.to_i} - AND current_way_nodes.node_id=current_nodes.id - AND current_nodes.visible=TRUE - ORDER BY sequence_id - SQL - ActiveRecord::Base.connection.select_all(sql).each do |row| - nodetags = {} - ActiveRecord::Base.connection.select_all("SELECT k,v FROM current_node_tags WHERE id=#{row['id']}").each do |n| - nodetags[n["k"]] = n["v"] - end - nodetags.delete("created_by") - points << [row["lon"].to_f, row["lat"].to_f, row["id"].to_i, nodetags, row["version"].to_i] - end - points - end - - def sql_get_tags_in_way(wayid) - tags = {} - ActiveRecord::Base.connection.select_all("SELECT k,v FROM current_way_tags WHERE id=#{wayid.to_i}").each do |row| - tags[row["k"]] = row["v"] - end - tags - end - - def sql_get_way_version(wayid) - ActiveRecord::Base.connection.select_one("SELECT version FROM current_ways WHERE id=#{wayid.to_i}")["version"] - end - - def sql_get_way_user(wayid) - ActiveRecord::Base.connection.select_one("SELECT user FROM current_ways,changesets WHERE current_ways.id=#{wayid.to_i} AND current_ways.changeset=changesets.id")["user"] - end - end -end diff --git a/app/controllers/api/changesets_controller.rb b/app/controllers/api/changesets_controller.rb index a236083db..29a57570d 100644 --- a/app/controllers/api/changesets_controller.rb +++ b/app/controllers/api/changesets_controller.rb @@ -319,9 +319,7 @@ module Api end # stupid Time seems to throw both of these for bad parsing, so # we have to catch both and ensure the correct code path is taken. - rescue ArgumentError => e - raise OSM::APIBadUserInput, e.message.to_s - rescue RuntimeError => e + rescue ArgumentError, RuntimeError => e raise OSM::APIBadUserInput, e.message.to_s end diff --git a/app/controllers/api/tracepoints_controller.rb b/app/controllers/api/tracepoints_controller.rb index f7b812f7c..b2d755fe6 100644 --- a/app/controllers/api/tracepoints_controller.rb +++ b/app/controllers/api/tracepoints_controller.rb @@ -33,7 +33,7 @@ module Api # get all the points ordered_points = Tracepoint.bbox(bbox).joins(:trace).where(:gpx_files => { :visibility => %w[trackable identifiable] }).order("gpx_id DESC, trackid ASC, timestamp ASC") unordered_points = Tracepoint.bbox(bbox).joins(:trace).where(:gpx_files => { :visibility => %w[public private] }).order("gps_points.latitude", "gps_points.longitude", "gps_points.timestamp") - points = ordered_points.union_all(unordered_points).offset(offset).limit(Settings.tracepoints_per_page) + points = ordered_points.union_all(unordered_points).offset(offset).limit(Settings.tracepoints_per_page).preload(:trace) doc = XML::Document.new doc.encoding = XML::Encoding::UTF_8 @@ -53,24 +53,22 @@ module Api trkseg = nil anon_track = nil anon_trkseg = nil - gpx_file = nil timestamps = false points.each do |point| if gpx_id != point.gpx_id gpx_id = point.gpx_id trackid = -1 - gpx_file = Trace.find(gpx_id) - if gpx_file.trackable? + if point.trace.trackable? track = XML::Node.new "trk" doc.root << track timestamps = true - if gpx_file.identifiable? - track << (XML::Node.new("name") << gpx_file.name) - track << (XML::Node.new("desc") << gpx_file.description) - track << (XML::Node.new("url") << url_for(:controller => "/traces", :action => "show", :display_name => gpx_file.user.display_name, :id => gpx_file.id)) + if point.trace.identifiable? + track << (XML::Node.new("name") << point.trace.name) + track << (XML::Node.new("desc") << point.trace.description) + track << (XML::Node.new("url") << url_for(:controller => "/traces", :action => "show", :display_name => point.trace.user.display_name, :id => point.trace.id)) end else # use the anonymous track segment if the user hasn't allowed @@ -85,7 +83,7 @@ module Api end if trackid != point.trackid - if gpx_file.trackable? + if point.trace.trackable? trkseg = XML::Node.new "trkseg" track << trkseg trackid = point.trackid diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 9f2d79eaa..586b18116 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,4 +1,6 @@ class ApplicationController < ActionController::Base + require "timeout" + include SessionPersistence protect_from_forgery :with => :exception @@ -229,7 +231,7 @@ class ApplicationController < ActionController::Base ## # wrap an api call in a timeout def api_call_timeout(&block) - OSM::Timer.timeout(Settings.api_timeout, Timeout::Error, &block) + Timeout.timeout(Settings.api_timeout, Timeout::Error, &block) rescue Timeout::Error raise OSM::APITimeoutError end @@ -237,7 +239,7 @@ class ApplicationController < ActionController::Base ## # wrap a web page in a timeout def web_timeout(&block) - OSM::Timer.timeout(Settings.web_timeout, Timeout::Error, &block) + Timeout.timeout(Settings.web_timeout, Timeout::Error, &block) rescue ActionView::Template::Error => e e = e.cause diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb index 7d05b6765..bc1220af8 100644 --- a/app/controllers/geocoder_controller.rb +++ b/app/controllers/geocoder_controller.rb @@ -319,11 +319,11 @@ class GeocoderController < ApplicationController def nsew_to_decdeg(captures) begin Float(captures[0]) - lat = !captures[2].casecmp("s").zero? ? captures[0].to_f : -captures[0].to_f - lon = !captures[5].casecmp("w").zero? ? captures[3].to_f : -captures[3].to_f + lat = captures[2].casecmp("s").zero? ? -captures[0].to_f : captures[0].to_f + lon = captures[5].casecmp("w").zero? ? -captures[3].to_f : captures[3].to_f rescue StandardError - lat = !captures[0].casecmp("s").zero? ? captures[1].to_f : -captures[1].to_f - lon = !captures[3].casecmp("w").zero? ? captures[4].to_f : -captures[4].to_f + lat = captures[0].casecmp("s").zero? ? -captures[1].to_f : captures[1].to_f + lon = captures[3].casecmp("w").zero? ? -captures[4].to_f : captures[4].to_f end { :lat => lat, :lon => lon } end @@ -331,11 +331,11 @@ class GeocoderController < ApplicationController def ddm_to_decdeg(captures) begin Float(captures[0]) - lat = !captures[3].casecmp("s").zero? ? captures[0].to_f + captures[1].to_f / 60 : -(captures[0].to_f + captures[1].to_f / 60) - lon = !captures[7].casecmp("w").zero? ? captures[4].to_f + captures[5].to_f / 60 : -(captures[4].to_f + captures[5].to_f / 60) + lat = captures[3].casecmp("s").zero? ? -(captures[0].to_f + captures[1].to_f / 60) : captures[0].to_f + captures[1].to_f / 60 + lon = captures[7].casecmp("w").zero? ? -(captures[4].to_f + captures[5].to_f / 60) : captures[4].to_f + captures[5].to_f / 60 rescue StandardError - lat = !captures[0].casecmp("s").zero? ? captures[1].to_f + captures[2].to_f / 60 : -(captures[1].to_f + captures[2].to_f / 60) - lon = !captures[4].casecmp("w").zero? ? captures[5].to_f + captures[6].to_f / 60 : -(captures[5].to_f + captures[6].to_f / 60) + lat = captures[0].casecmp("s").zero? ? -(captures[1].to_f + captures[2].to_f / 60) : captures[1].to_f + captures[2].to_f / 60 + lon = captures[4].casecmp("w").zero? ? -(captures[5].to_f + captures[6].to_f / 60) : captures[5].to_f + captures[6].to_f / 60 end { :lat => lat, :lon => lon } end @@ -343,11 +343,11 @@ class GeocoderController < ApplicationController def dms_to_decdeg(captures) begin Float(captures[0]) - lat = !captures[4].casecmp("s").zero? ? captures[0].to_f + (captures[1].to_f + captures[2].to_f / 60) / 60 : -(captures[0].to_f + (captures[1].to_f + captures[2].to_f / 60) / 60) - lon = !captures[9].casecmp("w").zero? ? captures[5].to_f + (captures[6].to_f + captures[7].to_f / 60) / 60 : -(captures[5].to_f + (captures[6].to_f + captures[7].to_f / 60) / 60) + lat = captures[4].casecmp("s").zero? ? -(captures[0].to_f + (captures[1].to_f + captures[2].to_f / 60) / 60) : captures[0].to_f + (captures[1].to_f + captures[2].to_f / 60) / 60 + lon = captures[9].casecmp("w").zero? ? -(captures[5].to_f + (captures[6].to_f + captures[7].to_f / 60) / 60) : captures[5].to_f + (captures[6].to_f + captures[7].to_f / 60) / 60 rescue StandardError - lat = !captures[0].casecmp("s").zero? ? captures[1].to_f + (captures[2].to_f + captures[3].to_f / 60) / 60 : -(captures[1].to_f + (captures[2].to_f + captures[3].to_f / 60) / 60) - lon = !captures[5].casecmp("w").zero? ? captures[6].to_f + (captures[7].to_f + captures[8].to_f / 60) / 60 : -(captures[6].to_f + (captures[7].to_f + captures[8].to_f / 60) / 60) + lat = captures[0].casecmp("s").zero? ? -(captures[1].to_f + (captures[2].to_f + captures[3].to_f / 60) / 60) : captures[1].to_f + (captures[2].to_f + captures[3].to_f / 60) / 60 + lon = captures[5].casecmp("w").zero? ? -(captures[6].to_f + (captures[7].to_f + captures[8].to_f / 60) / 60) : captures[6].to_f + (captures[7].to_f + captures[8].to_f / 60) / 60 end { :lat => lat, :lon => lon } end diff --git a/app/controllers/redactions_controller.rb b/app/controllers/redactions_controller.rb index 45a41058c..30425bd42 100644 --- a/app/controllers/redactions_controller.rb +++ b/app/controllers/redactions_controller.rb @@ -23,7 +23,7 @@ class RedactionsController < ApplicationController @redaction.user = current_user @redaction.title = params[:redaction][:title] @redaction.description = params[:redaction][:description] - # note that the description format will default to 'markdown' + # NOTE: the description format will default to 'markdown' if @redaction.save flash[:notice] = t(".flash") @@ -38,7 +38,7 @@ class RedactionsController < ApplicationController def edit; end def update - # note - don't update the user ID + # NOTE: don't update the user ID @redaction.title = params[:redaction][:title] @redaction.description = params[:redaction][:description] diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index 1cb848ea6..00b3e78da 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -61,14 +61,7 @@ class SiteController < ApplicationController require_user end - if %w[potlatch potlatch2].include?(editor) - append_content_security_policy_directives( - :connect_src => %w[*], - :object_src => %w[*], - :plugin_types => %w[application/x-shockwave-flash], - :script_src => %w['unsafe-inline'] - ) - elsif %w[id].include?(editor) + if %w[id].include?(editor) append_content_security_policy_directives( :frame_src => %w[blob:] ) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 2c8b00c17..db8b51f5c 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -24,7 +24,7 @@ module ApplicationHelper tag.div(:id => "#{id}_container", :class => "richtext_container") do output_buffer << tag.div(:id => "#{id}_content", :class => "richtext_content") do output_buffer << text_area(object_name, method, options.merge("data-preview-url" => preview_url(:type => type))) - output_buffer << tag.div("", :id => "#{id}_preview", :class => "richtext_preview richtext") + output_buffer << tag.div("", :id => "#{id}_preview", :class => "richtext_preview richtext text-break") end output_buffer << tag.div(:id => "#{id}_help", :class => "richtext_help") do diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb index 74f16380c..5b33b57b3 100644 --- a/app/helpers/user_helper.rb +++ b/app/helpers/user_helper.rb @@ -58,7 +58,7 @@ module UserHelper def auth_button(name, provider, options = {}) link_to( - image_tag("#{name}.png", :alt => t("users.login.auth_providers.#{name}.alt")), + image_tag("#{name}.svg", :alt => t("users.login.auth_providers.#{name}.alt"), :class => "rounded-lg"), auth_path(options.merge(:provider => provider)), :class => "auth_button", :title => t("users.login.auth_providers.#{name}.title") diff --git a/app/models/oauth_nonce.rb b/app/models/oauth_nonce.rb index 5f0920a96..86463f297 100644 --- a/app/models/oauth_nonce.rb +++ b/app/models/oauth_nonce.rb @@ -2,7 +2,7 @@ # # Table name: oauth_nonces # -# id :integer not null, primary key +# id :bigint not null, primary key # nonce :string # timestamp :integer # created_at :datetime diff --git a/app/models/old_node.rb b/app/models/old_node.rb index 12099498e..fe1a90013 100644 --- a/app/models/old_node.rb +++ b/app/models/old_node.rb @@ -32,7 +32,7 @@ class OldNode < ApplicationRecord self.table_name = "nodes" self.primary_keys = "node_id", "version" - # note this needs to be included after the table name changes, or + # NOTE: this needs to be included after the table name changes, or # the queries generated by Redactable will use the wrong table name. include Redactable diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb index f35678a19..bfbe673b0 100644 --- a/app/models/old_relation.rb +++ b/app/models/old_relation.rb @@ -27,7 +27,7 @@ class OldRelation < ApplicationRecord self.table_name = "relations" self.primary_keys = "relation_id", "version" - # note this needs to be included after the table name changes, or + # NOTE: this needs to be included after the table name changes, or # the queries generated by Redactable will use the wrong table name. include Redactable diff --git a/app/models/old_way.rb b/app/models/old_way.rb index 991925102..247123005 100644 --- a/app/models/old_way.rb +++ b/app/models/old_way.rb @@ -27,7 +27,7 @@ class OldWay < ApplicationRecord self.table_name = "ways" self.primary_keys = "way_id", "version" - # note this needs to be included after the table name changes, or + # NOTE: this needs to be included after the table name changes, or # the queries generated by Redactable will use the wrong table name. include Redactable @@ -103,37 +103,6 @@ class OldWay < ApplicationRecord el end - # Read full version of old way - # For get_nodes_undelete, uses same nodes, even if they've moved since - # For get_nodes_revert, allocates new ids - # Currently returns Potlatch-style array - # where [5] indicates whether latest version is usable as is (boolean) - # (i.e. is it visible? are we actually reverting to an earlier version?) - - def get_nodes_undelete - nds.collect do |n| - node = Node.find(n) - [node.lon, node.lat, n, node.version, node.tags_as_hash, node.visible] - end - end - - def get_nodes_revert(timestamp) - points = [] - nds.each do |n| - oldnode = OldNode.where("node_id = ? AND timestamp <= ?", n, timestamp).unredacted.order("timestamp DESC").first - curnode = Node.find(n) - id = n - reuse = curnode.visible - # if node has changed and it's in other ways, give it a new id - if !curnode.ways.all?(way_id) && (oldnode.lat != curnode.lat || oldnode.lon != curnode.lon || oldnode.tags != curnode.tags) - id = -1 - reuse = false - end - points << [oldnode.lon, oldnode.lat, id, curnode.version, oldnode.tags_as_hash, reuse] - end - points - end - # Temporary method to match interface to ways def way_nodes old_nodes diff --git a/app/models/report.rb b/app/models/report.rb index 9afedb04e..346c5eea9 100644 --- a/app/models/report.rb +++ b/app/models/report.rb @@ -32,8 +32,7 @@ class Report < ApplicationRecord def self.categories_for(reportable) case reportable.class.name - when "DiaryEntry" then %w[spam offensive threat other] - when "DiaryComment" then %w[spam offensive threat other] + when "DiaryEntry", "DiaryComment" then %w[spam offensive threat other] when "User" then %w[spam offensive threat vandal other] when "Note" then %w[spam personal abusive other] else %w[other] diff --git a/app/models/user.rb b/app/models/user.rb index 7e1f1c6d6..9cc8b7d83 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -153,26 +153,6 @@ class User < ApplicationRecord user end - def to_xml - doc = OSM::API.new.get_xml_doc - doc.root << to_xml_node - doc - end - - def to_xml_node - el1 = XML::Node.new "user" - el1["display_name"] = display_name.to_s - el1["account_created"] = creation_time.xmlschema - if home_lat && home_lon - home = XML::Node.new "home" - home["lat"] = home_lat.to_s - home["lon"] = home_lon.to_s - home["zoom"] = home_zoom.to_s - el1 << home - end - el1 - end - def description RichText.new(self[:description_format], self[:description]) end diff --git a/app/views/diary_entries/_diary_comment.html.erb b/app/views/diary_entries/_diary_comment.html.erb index 9a3ff969d..a7cdf21d7 100644 --- a/app/views/diary_entries/_diary_comment.html.erb +++ b/app/views/diary_entries/_diary_comment.html.erb @@ -6,7 +6,7 @@ <% end %>

-
<%= diary_comment.body.to_html %>
+
<%= diary_comment.body.to_html %>
<% if can? :hidecomment, DiaryEntry %> <% if diary_comment.visible? %> diff --git a/app/views/diary_entries/_diary_entry.html.erb b/app/views/diary_entries/_diary_entry.html.erb index 6616417a1..946c6ce17 100644 --- a/app/views/diary_entries/_diary_entry.html.erb +++ b/app/views/diary_entries/_diary_entry.html.erb @@ -15,7 +15,7 @@ -
+
<%= diary_entry.body.to_html %>
diff --git a/app/views/diary_entries/_form.html.erb b/app/views/diary_entries/_form.html.erb index 9585b09eb..ed7164e88 100644 --- a/app/views/diary_entries/_form.html.erb +++ b/app/views/diary_entries/_form.html.erb @@ -1,35 +1,19 @@ -
-
-
- - <%= f.text_field :title, :class => "richtext_title" %> -
-
- - <%= richtext_area :diary_entry, :body, :cols => 80, :rows => 20, :format => @diary_entry.body_format %> +<%= f.text_field :title %> +<%= f.richtext_field :body, :cols => 80, :rows => 20, :format => @diary_entry.body_format %> +<%= f.collection_select :language_code, Language.order(:english_name), :code, :name %> + +
+ <%= t ".location" -%> + + <%= tag.div "", :id => "map", :data => { :lat => @lat, :lon => @lon, :zoom => @zoom } %> + +
+ <%= f.text_field :latitude, :wrapper_class => "col-sm-4", :id => "latitude" %> + <%= f.text_field :longitude, :wrapper_class => "col-sm-4", :id => "longitude" %> +
+
-
- - <%= f.collection_select :language_code, Language.order(:english_name), :code, :name %>
-
-
- - <%= tag.div "", :id => "map", :data => { :lat => @lat, :lon => @lon, :zoom => @zoom } %> -
-
- - <%= f.text_field :latitude, :size => 20, :id => "latitude" %> -
-
- - <%= f.text_field :longitude, :size => 20, :id => "longitude" %> -
-
- <%= t ".use_map_link" -%> -
-
-
+
- <%= f.submit %> -
+<%= f.primary %> diff --git a/app/views/diary_entries/comments.html.erb b/app/views/diary_entries/comments.html.erb index ec8c3dfda..67036050d 100644 --- a/app/views/diary_entries/comments.html.erb +++ b/app/views/diary_entries/comments.html.erb @@ -14,7 +14,7 @@ "> <%= 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') %> - <%= comment.body.to_html %> + <%= comment.body.to_html %> <% end -%> diff --git a/app/views/diary_entries/edit.html.erb b/app/views/diary_entries/edit.html.erb index 5ea619328..c8df07f4c 100644 --- a/app/views/diary_entries/edit.html.erb +++ b/app/views/diary_entries/edit.html.erb @@ -6,8 +6,6 @@

<%= @title %>

<% end %> -<%= error_messages_for "diary_entry" %> - -<%= form_for @diary_entry, :url => diary_entry_path(current_user, @diary_entry), :html => { :method => :put } do |f| %> +<%= bootstrap_form_for @diary_entry, :url => diary_entry_path(current_user, @diary_entry), :html => { :method => :put } do |f| %> <%= render :partial => "form", :locals => { :f => f } %> <% end %> diff --git a/app/views/diary_entries/index.html.erb b/app/views/diary_entries/index.html.erb index 96c052da6..17ddba62e 100644 --- a/app/views/diary_entries/index.html.erb +++ b/app/views/diary_entries/index.html.erb @@ -5,7 +5,7 @@ <% end %>

<%= @title %>

-
    +
      <% unless params[:friends] or params[:nearby] -%>
    • <%= rss_link_to :action => "rss", :language => params[:language] %>
      • <% end -%> @@ -28,21 +28,29 @@ <%= render @entries %> - + <% if @page > 1 -%> +
    • + <%= link_to t(".newer_entries"), @params.merge(:page => @page - 1), :class => "page-link" %> +
      • + <% else -%> +
    • + <%= t(".newer_entries") %> +
      • + <% end -%> +
    + <% end %> <% unless params[:friends] or params[:nearby] -%> diff --git a/app/views/diary_entries/new.html.erb b/app/views/diary_entries/new.html.erb index dfe69f22a..0a10cfd03 100644 --- a/app/views/diary_entries/new.html.erb +++ b/app/views/diary_entries/new.html.erb @@ -6,8 +6,6 @@

    <%= @title %>

    <% end %> -<%= error_messages_for "diary_entry" %> - -<%= form_for @diary_entry do |f| %> +<%= bootstrap_form_for @diary_entry do |f| %> <%= render :partial => "form", :locals => { :f => f } %> <% end %> diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb index 080503f72..3631467fd 100644 --- a/app/views/messages/show.html.erb +++ b/app/views/messages/show.html.erb @@ -32,7 +32,7 @@
-
<%= @message.body.to_html %>
+
<%= @message.body.to_html %>
<%= link_to t(".back"), outbox_messages_path, :class => "btn btn-link" %> diff --git a/app/views/redactions/show.html.erb b/app/views/redactions/show.html.erb index 1eb20f16f..cf5116ede 100644 --- a/app/views/redactions/show.html.erb +++ b/app/views/redactions/show.html.erb @@ -7,7 +7,7 @@ <%= t ".user" %> <%= link_to(@redaction.user.display_name, user_path(@redaction.user)) %>

-
+
<%= t ".description" %> <%= @redaction.description.to_html %>
diff --git a/app/views/shared/_html_help.erb b/app/views/shared/_html_help.erb new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/shared/_markdown_help.html.erb b/app/views/shared/_markdown_help.html.erb new file mode 100644 index 000000000..5bd8c4955 --- /dev/null +++ b/app/views/shared/_markdown_help.html.erb @@ -0,0 +1,19 @@ +
<%= t ".title_html" %>
+
+
<%= t ".headings" %>
+
# <%= t ".heading" %>
+ ## <%= t ".subheading" %>
+
<%= t ".unordered" %>
+
* <%= t ".first" %>
+ * <%= t ".second" %>
+ +
<%= t ".ordered" %>
+
1. <%= t ".first" %>
+ 2. <%= t ".second" %>
+ +
<%= t ".link" %>
+
[<%= t ".text" %>](<%= t ".url" %>)
+ +
<%= t ".image" %>
+
![<%= t ".alt" %>](<%= t ".url" %>)
+
diff --git a/app/views/shared/_richtext_field.html.erb b/app/views/shared/_richtext_field.html.erb new file mode 100644 index 000000000..cfe6f9827 --- /dev/null +++ b/app/views/shared/_richtext_field.html.erb @@ -0,0 +1,15 @@ +
+
+ <%= builder.text_area(attribute, options.merge(:wrapper => false, "data-preview-url" => preview_url(:type => type))) %> +
+
+
+
+
+ <%= render :partial => "shared/#{type}_help" %> + <%= submit_tag t(".edit"), :id => "#{id}_doedit", :class => "richtext_doedit btn btn-primary", :disabled => true %> + <%= submit_tag t(".preview"), :id => "#{id}_dopreview", :class => "richtext_dopreview btn btn-primary" %> +
+
+
+
diff --git a/app/views/site/_potlatch.html.erb b/app/views/site/_potlatch.html.erb index 89ee47f87..946519d73 100644 --- a/app/views/site/_potlatch.html.erb +++ b/app/views/site/_potlatch.html.erb @@ -1,10 +1,5 @@ -<%= javascript_include_tag "edit/potlatch" %> - -
- <% session[:token] = current_user.tokens.create.token unless session[:token] && UserToken.find_by(:token => session[:token]) -%> - <% data = { :token => session[:token] } -%> - <% data[:lat] = @lat if @lat -%> - <% data[:lon] = @lon if @lon -%> - <% data[:zoom] = @zoom if @zoom -%> - <%= tag.div t("site.edit.flash_player_required_html"), :id => "potlatch", :data => data %> +
+

<%= t ".removed" %>

+

<%= t ".desktop_html" %>

+

<%= t ".id_html", :settings_url => user_account_path(current_user) %>

diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb index 1ff16eac0..9d271d4ce 100644 --- a/app/views/site/_potlatch2.html.erb +++ b/app/views/site/_potlatch2.html.erb @@ -1,19 +1 @@ -<%= javascript_include_tag "edit/potlatch2" %> - -
- <% session[:token] = current_user.tokens.create.token unless session[:token] && UserToken.find_by(:token => session[:token]) -%> - <% data = { :token => session[:token] } -%> - <% data[:lat] = @lat if @lat -%> - <% data[:lon] = @lon if @lon -%> - <% data[:zoom] = @zoom if @zoom -%> - <% if Settings.key?(:potlatch2_key) %> - <% token = current_user.access_token(Settings.potlatch2_key) %> - <% data[:token] = token.token -%> - <% data[:token_secret] = token.secret -%> - <% data[:consumer_key] = token.client_application.key -%> - <% data[:consumer_secret] = token.client_application.secret -%> - <% end %> - <% data[:locale] = Locale.list(Potlatch2::LOCALES.keys).preferred(preferred_languages).to_s -%> - <% data[:locale_path] = asset_path("potlatch2/locales/#{Potlatch2::LOCALES[data[:locale]]}.swf") -%> - <%= tag.div t("site.edit.flash_player_required_html"), :id => "potlatch", :data => data %> -
+<%= render :partial => "potlatch" %> diff --git a/app/views/traces/_trace_paging_nav.html.erb b/app/views/traces/_trace_paging_nav.html.erb index 4fcc7b4d8..25e35d226 100644 --- a/app/views/traces/_trace_paging_nav.html.erb +++ b/app/views/traces/_trace_paging_nav.html.erb @@ -1,18 +1,27 @@ -

+

diff --git a/app/views/traces/index.html.erb b/app/views/traces/index.html.erb index 609dbcede..fa69c48a2 100644 --- a/app/views/traces/index.html.erb +++ b/app/views/traces/index.html.erb @@ -23,7 +23,7 @@ <% end %> <% if @traces.size > 0 %> - <%= render :partial => "trace_paging_nav" %> + <%= render "trace_paging_nav", :page => @page, :page_size => @page_size, :traces => @traces, :params => @params %> @@ -31,7 +31,7 @@
- <%= render :partial => "trace_paging_nav" %> + <%= render "trace_paging_nav", :page => @page, :page_size => @page_size, :traces => @traces, :params => @params %> <% else %>

<%= t ".empty_html", :upload_link => new_trace_path %>

<% end %> diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb index 69207d4e4..52c099ee4 100644 --- a/app/views/user_blocks/show.html.erb +++ b/app/views/user_blocks/show.html.erb @@ -33,4 +33,4 @@

<%= t ".status" %>: <%= block_status(@user_block) %>

<%= t ".reason" %>

-
<%= @user_block.reason.to_html %>
+
<%= @user_block.reason.to_html %>
diff --git a/app/views/user_mailer/message_notification.html.erb b/app/views/user_mailer/message_notification.html.erb index fd49c6723..4095b5e59 100644 --- a/app/views/user_mailer/message_notification.html.erb +++ b/app/views/user_mailer/message_notification.html.erb @@ -2,7 +2,7 @@ <%= t ".hi", :to_user => @to_user %>

- <%= t ".header", + <%= t ".header_html", :from_user => link_to_user(@from_user), :subject => tag.em(@title) %>

diff --git a/app/views/users/_contact.html.erb b/app/views/users/_contact.html.erb index d46a61984..a5b29411c 100644 --- a/app/views/users/_contact.html.erb +++ b/app/views/users/_contact.html.erb @@ -22,7 +22,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')) %> - <% comment = changeset.tags["comment"].to_s != "" ? changeset.tags["comment"] : t("browse.no_comment") %> + <% comment = changeset.tags["comment"].to_s == "" ? t("browse.no_comment") : changeset.tags["comment"] %> <%= link_to(comment, { :controller => "browse", :action => "changeset", :id => changeset.id }, { :title => t("changesets.changeset.view_changeset_details") }) %> diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb index 399ef8dcd..f01f8d1ed 100644 --- a/app/views/users/_user.html.erb +++ b/app/views/users/_user.html.erb @@ -15,7 +15,7 @@ :date => l(user.creation_time, :format => :friendly) %> <% end %>

-
<%= user.description.to_html %>
+
<%= user.description.to_html %>
<%= check_box_tag "user_#{user.id}", "", false, :name => "user[#{user.id}]" %> diff --git a/app/views/users/account.html.erb b/app/views/users/account.html.erb index ad6614c76..394e81cd1 100644 --- a/app/views/users/account.html.erb +++ b/app/views/users/account.html.erb @@ -85,7 +85,7 @@
- <%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{Settings.default_editor}.name")), "default"]] + Editors::ALL_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %> + <%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{Settings.default_editor}.name")), "default"]] + Editors::AVAILABLE_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %>
diff --git a/app/views/users/login.html.erb b/app/views/users/login.html.erb index 365245bf0..78ba25fa4 100644 --- a/app/views/users/login.html.erb +++ b/app/views/users/login.html.erb @@ -7,41 +7,18 @@ <% end %>
- <%= form_tag({ :action => "login" }, { :id => "login_form" }) do %> - <%= hidden_field_tag("referer", h(params[:referer])) %> - -

<%= t ".no account" %> <%= link_to t(".register now"), :action => :new, :referer => params[:referer] %>

- -
+

<%= t ".no account" %> <%= link_to t(".register now"), :action => :new, :referer => params[:referer] %>

-
-
- - <%= text_field_tag "username", params[:username], :tabindex => 1 %> -
-
- - <%= password_field_tag "password", "", :tabindex => 2 %> -
- - <%= link_to t(".lost password link"), :controller => "users", :action => "lost_password" %> - -
- -
- <%= check_box_tag "remember_me", "yes", params[:remember_me] == "yes", :tabindex => 3 %> - - <%= submit_tag t(".login_button"), :tabindex => 4 %> -
+ <%= bootstrap_form_tag(:action => "login", :html => { :id => "login_form" }) do |f| %> + <%= hidden_field_tag("referer", h(params[:referer])) %> -
+ <%= f.text_field :username, :label => t(".email or username"), :tabindex => 1, :value => params[:username] %> + <%= f.password_field :password, :label => t(".password"), :tabindex => 2, :value => "", :help => link_to(t(".lost password link"), :controller => "users", :action => "lost_password") %> + <%= f.form_group do %> + <%= f.check_box :remember_me, { :label => t(".remember"), :tabindex => 3, :checked => (params[:remember_me] == "yes") }, "yes" %> + <% end %> + <%= f.primary t(".login_button"), :tabindex => 4 %> <% end %> <%= form_tag(auth_path(:provider => "openid"), :id => "openid_login_form") do %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 694f561b2..302ec5bd3 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -163,7 +163,7 @@

-
<%= @user.description.to_html %>
+
<%= @user.description.to_html %>
diff --git a/config/application.rb b/config/application.rb index 54390ba29..f5638e233 100644 --- a/config/application.rb +++ b/config/application.rb @@ -31,9 +31,6 @@ module OpenStreetMap # Custom directories with classes and modules you want to be autoloadable. config.autoload_paths += %W[#{config.root}/lib] - # Continue to use the classic autoloader for now - config.autoloader = :classic - # Force requests from old versions of IE (<= IE8) to be UTF-8 encoded. # This has defaulted to false since rails 6.0 config.action_view.default_enforce_utf8 = true diff --git a/config/github.database.yml b/config/github.database.yml new file mode 100644 index 000000000..9f9c4b1de --- /dev/null +++ b/config/github.database.yml @@ -0,0 +1,4 @@ +test: + adapter: postgresql + database: openstreetmap + encoding: utf8 diff --git a/config/initializers/bootstrap_form.rb b/config/initializers/bootstrap_form.rb new file mode 100644 index 000000000..a61932c53 --- /dev/null +++ b/config/initializers/bootstrap_form.rb @@ -0,0 +1,2 @@ +# Include our custom RichtextField input method for `f.richtext_field` in forms +BootstrapForm::FormBuilder.include BootstrapForm::Inputs::RichtextField diff --git a/config/initializers/migrate.rb b/config/initializers/migrate.rb new file mode 100644 index 000000000..787f3d551 --- /dev/null +++ b/config/initializers/migrate.rb @@ -0,0 +1,59 @@ +if defined?(ActiveRecord::ConnectionAdapters::AbstractAdapter) + module OpenStreetMap + module ActiveRecord + module AbstractAdapter + def add_index_options(table_name, column_name, options = {}) + columns = options.delete(:columns) + index_name, index_type, index_columns, index_options, algorithm, using = super(table_name, column_name, options) + [index_name, index_type, columns || index_columns, index_options, algorithm, using] + end + end + + module PostgreSQLAdapter + def quote_column_name(name) + Array(name).map { |n| super(n) }.join(", ") + end + + def add_primary_key(table_name, column_name, _options = {}) + table_name = quote_table_name(table_name) + column_name = quote_column_name(column_name) + + execute "ALTER TABLE #{table_name} ADD PRIMARY KEY (#{column_name})" + end + + def remove_primary_key(table_name) + table_name = quote_table_name(table_name) + + execute "ALTER TABLE #{table_name} DROP PRIMARY KEY" + end + + def alter_primary_key(table_name, new_columns) + constraint_name = quote_table_name("#{table_name}_pkey") + table_name = quote_table_name(table_name) + new_columns = quote_column_name(new_columns) + + execute "ALTER TABLE #{table_name} DROP CONSTRAINT #{constraint_name}" + execute "ALTER TABLE #{table_name} ADD PRIMARY KEY (#{new_columns})" + end + + def create_enumeration(enumeration_name, values) + execute "CREATE TYPE #{enumeration_name} AS ENUM ('#{values.join '\',\''}')" + end + + def drop_enumeration(enumeration_name) + execute "DROP TYPE #{enumeration_name}" + end + + def rename_enumeration(old_name, new_name) + old_name = quote_table_name(old_name) + new_name = quote_table_name(new_name) + + execute "ALTER TYPE #{old_name} RENAME TO #{new_name}" + end + end + end + end + + ActiveRecord::ConnectionAdapters::AbstractAdapter.prepend(OpenStreetMap::ActiveRecord::AbstractAdapter) + ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(OpenStreetMap::ActiveRecord::PostgreSQLAdapter) +end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb index 576da5285..7e10da4fb 100644 --- a/config/initializers/mime_types.rb +++ b/config/initializers/mime_types.rb @@ -2,5 +2,4 @@ # Add new mime types for use in respond_to blocks: # Mime::Type.register "text/richtext", :rtf -Mime::Type.register "application/x-amf", :amf Mime::Type.register "application/gpx+xml", :gpx diff --git a/config/initializers/potlatch.rb b/config/initializers/potlatch.rb deleted file mode 100644 index 223083b7e..000000000 --- a/config/initializers/potlatch.rb +++ /dev/null @@ -1,6 +0,0 @@ -# Load presets -POTLATCH_PRESETS = Potlatch::Potlatch.get_presets - -# Use SQL (faster) or Rails (more elegant) for common Potlatch reads -# getway speedup is approximately x2, whichways approximately x7 -POTLATCH_USE_SQL = false diff --git a/config/initializers/strong_migrations.rb b/config/initializers/strong_migrations.rb index b1f4707b5..a2a56074f 100644 --- a/config/initializers/strong_migrations.rb +++ b/config/initializers/strong_migrations.rb @@ -1 +1 @@ -StrongMigrations.start_after = 20190518115041 # rubocop:disable Style/NumericLiterals +StrongMigrations.start_after = 20190518115041 diff --git a/config/initializers/zeitwerk.rb b/config/initializers/zeitwerk.rb new file mode 100644 index 000000000..49bd78d8e --- /dev/null +++ b/config/initializers/zeitwerk.rb @@ -0,0 +1,8 @@ +Rails.autoloaders.each do |autoloader| + autoloader.inflector.inflect( + "gpx" => "GPX", + "id" => "ID", + "osm" => "OSM", + "utf8" => "UTF8" + ) +end diff --git a/config/locales/af.yml b/config/locales/af.yml index 8b66d92d9..a516bc49f 100644 --- a/config/locales/af.yml +++ b/config/locales/af.yml @@ -160,15 +160,9 @@ af: other: '%{count} jaar gelede' editor: default: Verstek (tans %{name}) - potlatch: - name: Potknip 1 - description: Potknip 1 (aanlynredigeerder) id: name: iD description: iD (aanlynredigeerder) - potlatch2: - name: Potknip 2 - description: Potknip 2 (aanlynredigeerder) remote: name: Afstandsbeheer description: Afstandsbeheer (JOSM of Merkaartor) @@ -363,12 +357,7 @@ af: new: title: Nuwe dagboekinskrywing form: - subject: 'Onderwerp:' - body: 'Teks:' - language: 'Taal:' location: 'Ligging:' - latitude: 'Breedtegraad:' - longitude: 'Lengtegraad:' use_map_link: gebruik kaart index: title: Gebruikersdagboeke @@ -1178,21 +1167,11 @@ af: sodat u kan wegtrek. email_confirm: subject: '[OpenStreetMap] Bevestig u e-posadres' - email_confirm_plain: greeting: Hallo, - email_confirm_html: - greeting: Hallo, - hopefully_you: Iemand (hopelik u) wil hul e-posadres op %{server_url} verander - na %{new_address}. - click_the_link: As dit u is, klik die onderstaande skakel om die verandering - te bevestig. lost_password: subject: '[OpenStreetMap] Versoek om wagwoord te herstel' - lost_password_plain: greeting: Hallo, click_the_link: As dit u is, klik die onderstaande skakel om u wagwoord te herstel. - lost_password_html: - greeting: Hallo, note_comment_notification: anonymous: '''n Anonieme gebruiker' greeting: Hallo, diff --git a/config/locales/aln.yml b/config/locales/aln.yml index d3b7f307d..977c5e0ff 100644 --- a/config/locales/aln.yml +++ b/config/locales/aln.yml @@ -174,12 +174,7 @@ aln: new: title: Hyrja e re Ditari form: - subject: 'Titulli:' - body: 'Trupi:' - language: 'Gjuha:' location: 'Lokacioni:' - latitude: 'Latitude:' - longitude: 'Gjatësi:' use_map_link: Harta e përdorimit index: title: ditarë Përdorues , @@ -668,26 +663,12 @@ aln: subject: '[OpenStreetMap] Konfirmoje email adresën tonde' email_confirm: subject: '[OpenStreetMap] Konfirmoje email adresën tonde' - email_confirm_plain: greeting: Tung, click_the_link: Nëse ky je ti, ju lutem trusni lidhjen e mëposhtme për me konfirmu ndryshimin. - email_confirm_html: - greeting: Tung, - hopefully_you: Dikush (shpresojmë se ju), do të doja të ndryshuar adresën e-mail - e tyre gjatë në %{server_url} në %{new_address}. - click_the_link: Nëse ky je ti, ju lutem trusni lidhjen e mëposhtme për me konfirmu - ndryshimin. lost_password: subject: '[OpenStreetMap] kërkesës Password reset' - lost_password_plain: - greeting: Tung, - click_the_link: Nëse kjo është që ju, ju lutemi klikoni lidhjen më poshtë për - të rivendosni fjalëkalimin tuaj. - lost_password_html: greeting: Tung, - hopefully_you: Dikush (ndoshta ju) ka kërkuar një fjalëkalim për t,u rivendosur - në llogarinë openstreetmap.org këtë adresë email-i. click_the_link: Nëse kjo është që ju, ju lutemi klikoni lidhjen më poshtë për të rivendosni fjalëkalimin tuaj. messages: @@ -850,14 +831,6 @@ aln: tuaj. user_page_link: faqe përdorues anon_edits_link_text: Find out pse kjo është e rastit. - flash_player_required_html: Ju duhet me pas Flash player për me përdor Potlatch, - Flash editorin e OpenStreetMap. Ju muni me - marr Flash Player nga Adobe.com. Disa - mënyra të tjera janë të mundshme për me editu OpenStreetMap. - potlatch_unsaved_changes: Ju keni para shpëtimit të ndryshimeve. (Për të ruajtur - në Potlatch, ju duhet të asnjërën mënyrë e tanishme ose me pikën e, në qoftë - se redaktimi në mënyrë të jetojnë, ose klikoni ruani në qoftë se ju keni një - buton të shpëtuar.) export: area_to_export: Zona për Eksport manually_select: Manualisht zgedhe ni zon te ndryshme diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 4f83f957f..58e37a9bf 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -21,6 +21,7 @@ # Author: Mido # Author: Mohammed Qubati # Author: Mutarjem horr +# Author: NEHAOUA # Author: Omda4wady # Author: OsamaK # Author: Ruila @@ -58,7 +59,7 @@ ar: create: أرسل client_application: create: سجِّل - update: تعديل + update: تحديث redaction: create: إنشاء تنقيح update: حفظ التنقيح @@ -111,8 +112,17 @@ ar: way_tag: سمة طريق attributes: client_application: + name: الاسم (مطلوب) + url: ' مسار (URL) للتطبيق الرئيسي (مطلوب)' callback_url: رابط الرد support_url: رابط الدعم + allow_read_prefs: قراءة تفضيلات المستخدم الخاصة بهم + allow_write_prefs: تعديل تفضيلات المستخدم الخاصة بهم + allow_write_diary: إنشاء إدخالات اليوميات والتعليقات وتكوين صداقات + allow_write_api: تعديل الخريطة. + allow_read_gpx: قراءة آثار جي بي إس الخاصة بهم + allow_write_gpx: رفع آثار جي بي إس. + allow_write_notes: تعديل الملاحظات. diary_comment: body: الجسم diary_entry: @@ -127,21 +137,22 @@ ar: trace: user: المستخدم visible: ظاهر - name: الاسم + name: اسم الملف size: الحجم latitude: خط العرض longitude: خط الطول public: عام description: الوصف - gpx_file: 'ارفع ملف GPX:' - visibility: 'الرؤية:' - tagstring: 'الوسوم:' + gpx_file: رفع ملف GPX + visibility: الرؤية + tagstring: الوسوم message: sender: المرسل title: الموضوع body: نص الرسالة recipient: المستلم report: + category: حدد سبب التقرير الخاص بك details: يُرجَى تقديم بعض التفاصيل حول المشكلة (مطلوب). user: email: البريد الإلكتروني @@ -150,6 +161,7 @@ ar: description: الوصف languages: اللغات pass_crypt: كلمة السر + pass_crypt_confirmation: أكد كلمة السر help: trace: tagstring: محدد بفواصل @@ -197,15 +209,9 @@ ar: with_name_html: '%{name} (%{id})' editor: default: الافتراضي (حالياً %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (محرر ضمن المتصفح) id: name: آي دي description: آي دي (محرر عبر المتصفح) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (محرر ضمن المتصفح) remote: name: تحكم عن بعد description: تحكم عن بعد (JOSM أو Merkaartor) @@ -414,12 +420,7 @@ ar: new: title: مدخلة يومية جديدة form: - subject: 'الموضوع:' - body: 'النص:' - language: 'اللغة:' location: 'الموقع:' - latitude: 'خط العرض:' - longitude: 'خط الطول:' use_map_link: استخدم الخريطة index: title: يوميات المستخدمين @@ -1266,7 +1267,6 @@ ar: footer: يمكنك أيضًا قراءة التعليق على %{readurl} ويمكنك التعليق على %{commenturl} أو الرد على %{replyurl} message_notification: - subject_header: '[OpenStreetMap] %{subject}' hi: مرحبًا %{to_user}، header: '%{from_user} قام بإرسال رسالة لك عبر خريطة الشارع المفتوحة بالعنوان %{subject}:' @@ -1294,30 +1294,17 @@ ar: welcome: بعد تأكيد حسابك، سوف نقدم لك بعض المعلومات الإضافية للبدء. email_confirm: subject: '[خريطة الشارع المفتوحة] أكّد عنوان بريدك الإلكتروني' - email_confirm_plain: greeting: تحياتي، hopefully_you: شخص ما (نأمل أن تكون أنت) يرغب في تغيير عنوان بريده الإلكتروني في %{server_url} إلى %{new_address}. click_the_link: إذا كان هذا أنت، يُرجَى الضغط على الرابط أدناه لتأكيد التغيير. - email_confirm_html: - greeting: مرحبًا، - hopefully_you: شخص ما (نأمل أنت) يرغب بتغيير عنوان بريده الإلكتروني على %{server_url} - إلى %{new_address}. - click_the_link: إذا كان هذا أنت، رجاءً انقر فوق الرابط أدناه لتأكيد التغيير. lost_password: subject: '[خريطة الشارع المفتوحة] طلب إعادة تعيين كلمة السر' - lost_password_plain: - greeting: تحياتي، + greeting: مرحبًا، hopefully_you: طالب شخص ما (ربما أنت) بإعادة تعيين كلمة السر على حساب openstreetmap.org لعنوان البريد الإلكتروني هذا. click_the_link: إذا كان هذا أنت، يُرجَى الضغط على الرابط أدناه لإعادة تعيين كلمة المرور. - lost_password_html: - greeting: تحياتي، - hopefully_you: طالب شخص ما (ربما أنت) بإعادة تعيين كلمة المرور على حساب openstreetmap.org - لعنوان البريد الإلكتروني هذا. - click_the_link: إذا كان هذا أنت، يُرجَى الضغط على الرابط أدناه لإعادة تعيين - كلمة المرور. note_comment_notification: anonymous: مستخدم مجهول greeting: مرحبا، @@ -1427,6 +1414,14 @@ ar: as_unread: عُلِّمت الرسالة كغير مقروءة destroy: destroyed: حُذِفت الرسالة + shared: + markdown_help: + unordered: قائمة غير مرتبة + ordered: قائمة مرتبة + link: وصلة + alt: كل النص + richtext_field: + preview: معاينة site: about: next: التالي @@ -1619,17 +1614,6 @@ ar: user_page_link: صفحة مستخدم anon_edits_html: (%{link}) anon_edits_link_text: ابحث عن السبب لماذا هو هذا الحال. - flash_player_required_html: أنت بحاجة لمشغل فلاش لاستخدام Potlatch، محرر فلاش - خريطة الشارع المفتوحة. يمكنك تنزيل - مشغل الفلاش من موقع أدوبي. وهناك - خيارات أخرى أيضًا متاحة لتعديل خريطة الشارع المفتوحة. - potlatch_unsaved_changes: لديك تغييرات غير محفوظة. (للحفظ في Potlatch؛ يجب إلغاء - الطريق أو النقطة الحاليين إن كان التعديل في الوضع الحي، أو انقر فوق حفظ إن - كان لديك زر الحفظ.) - potlatch2_not_configured: لم يتم تكوين Potlatch 2 - يُرجَى الاطلاع على http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 - للمزيد من المعلومات - potlatch2_unsaved_changes: لديك تغييرات غير محفوظة. (للحفظ في Potlatch 2; يجب - النقر فوق حفظ.) id_not_configured: لم يتم تكوين آي دي no_iframe_support: متصفحك لا يدعم الإطارات المضمنة HTML، والتي هي ضرورية لهذه الميزة. diff --git a/config/locales/arz.yml b/config/locales/arz.yml index c7292ed33..1a2dc2676 100644 --- a/config/locales/arz.yml +++ b/config/locales/arz.yml @@ -149,12 +149,7 @@ arz: new: title: مدخله يوميه جديدة form: - subject: 'الموضوع:' - body: 'نص الرسالة:' - language: 'اللغة:' location: 'الموقع:' - latitude: 'خط العرض:' - longitude: 'خط الطول:' use_map_link: استخدم الخريطة index: title: يوميات المستخدمين @@ -612,24 +607,11 @@ arz: subject: '[خريطه الشارع المفتوحه] اهلا بيك فى اوبن ستريت ماب' email_confirm: subject: '[خريطه الشارع المفتوحة] أكّد عنوان بريدك الإلكتروني' - email_confirm_plain: greeting: تحياتى، click_the_link: إذا كان هذا هو أنت، يرجى الضغط على الرابط أدناه لتأكيد التغيير. - email_confirm_html: - greeting: مرحبًا، - hopefully_you: شخص ما (نأمل أنت) يرغب بتغيير عنوان بريده الإلكترونى على %{server_url} - to %{new_address}. - click_the_link: إذا كان هذا هو أنت، رجاءًا انقر فوق الرابط أدناه لتأكيد التغيير. lost_password: subject: '[خريطه الشارع المفتوحة] طلب إعاده تعيين كلمه المرور' - lost_password_plain: - greeting: تحياتى، - click_the_link: إذا كان هذا هو أنت، يرجى الضغط على الرابط أدناه لإعاده تعيين - كلمه المرور. - lost_password_html: - greeting: تحياتى، - hopefully_you: شخص ما (ربما أنت) طلب إعاده تعيين كلمه المرور لحساب openstreetmap.org على - عنوان البريد الإلكترونى هذا. + greeting: مرحبًا، click_the_link: إذا كان هذا هو أنت، يرجى الضغط على الرابط أدناه لإعاده تعيين كلمه المرور. messages: @@ -696,13 +678,6 @@ arz: يمكنك تعيين تعديلاتك لتظهر بشكل علنى من حسابك %{user_page}. user_page_link: صفحه مستخدم anon_edits_link_text: ابحث عن السبب لماذا هو هذا الحال. - flash_player_required_html: أنت بحاجه لمشغل فلاش لاستخدام Potlatch، محرر فلاش - خريطه الشارع المفتوحه. يمكنك تنزيل - مشغل الفلاش من موقع أدوبي. وهناك - خيارات أخرى أيضًا متاحه لتعديل خريطه الشارع المفتوحه. - potlatch_unsaved_changes: لديك تغييرات غير محفوظه. (للحفظ فى Potlatch، يجب إلغاء - الطريق أو النقطه الحاليين إن كان التعديل فى الوضع المباشر، أو انقر فوق حفظ - إن كان لديك زر الحفظ.) export: area_to_export: المنطقه المطلوب تصديرها manually_select: اختر يدويًا منطقه أخرى diff --git a/config/locales/ast.yml b/config/locales/ast.yml index e520e3c96..b14654f3a 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -162,15 +162,9 @@ ast: other: fai %{count} años editor: default: Predetermináu (anguaño %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (editor nel restolador) id: name: iD description: iD (editor nel navegador) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (editor nel restolador) remote: name: Control remotu description: Control remotu (JOSM o Merkaartor) @@ -377,12 +371,7 @@ ast: new: title: Nueva entrada del diariu form: - subject: 'Asuntu:' - body: 'Cuerpu:' - language: 'Llingua:' location: 'Allugamientu:' - latitude: 'Llatitú:' - longitude: 'Llonxitú:' use_map_link: usar mapa index: title: Diarios d'usuarios @@ -1249,28 +1238,16 @@ ast: nos primeros pasos. email_confirm: subject: '[OpenStreetMap] Confirma la to direición de corréu' - email_confirm_plain: - greeting: Bones, - hopefully_you: Dalguién (esperamos que tu) quier camudar la so direición de - corréu en %{server_url} a %{new_address}. - click_the_link: Si yes tú, calca nel enllaz d'abaxo pa confirmar el cambéu. - email_confirm_html: greeting: Bones, hopefully_you: Dalguién (esperamos que tu) quier camudar la so direición de corréu en %{server_url} a %{new_address}. click_the_link: Si yes tú, calca nel enllaz d'abaxo pa confirmar el cambéu. lost_password: subject: '[OpenStreetMap] Solicitú de reestablecimientu de contraseña' - lost_password_plain: greeting: Bones, hopefully_you: Dalguién (esperamos que tu) pidió que se-y reanicie la contraseña na cuenta d'openstreetmap.org con estes señes de corréu. click_the_link: Si yes tu, calca nel enllaz d'abaxo pa reestablecer la contraseña. - lost_password_html: - greeting: Bones, - hopefully_you: Dalguién (posiblemente tu) pidió reestablecer la contraseña de - la cuenta d'openstreetmap.org con estes señes de corréu. - click_the_link: Si yes tu, calca nel enllaz d'abaxo pa reestablecer la contraseña. note_comment_notification: anonymous: Un usuariu anónimu greeting: Bones, @@ -1569,17 +1546,6 @@ ast: lo faigas. Puedes marcar les tos ediciones como públiques dende la to %{user_page}. user_page_link: páxina d'usuariu anon_edits_link_text: Descubri por qué ye'l casu. - flash_player_required_html: Necesites un reproductor Flash pa usar Potlatch, - l'editor Flash d'OpenStreetMap. Puedes descargar - el reproductor Flash d'Adobe.com. Tamién hai disponibles otres - opciones pa editar OpenStreetMap. - potlatch_unsaved_changes: Tienes cambios ensin guardar. (Pa guardalos en Potlatch, - tienes de deseleicionar la vía o puntu actual si tas editando en vivo, o calcar - nel botón guardar si apaez esi botón). - potlatch2_not_configured: Potlatch 2 nun ta configuráu; visita https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 - pa más información - potlatch2_unsaved_changes: Tienes cambios ensin guardar. (Pa guardar en Potlatch - 2, tienes de calcar en guardar). id_not_configured: iD nun ta configuráu no_iframe_support: El to navegador nun tien encontu pa los iframes HTML, que se necesiten pa esta carauterística. diff --git a/config/locales/az.yml b/config/locales/az.yml index 7d51098f7..d23f997f1 100644 --- a/config/locales/az.yml +++ b/config/locales/az.yml @@ -4,6 +4,7 @@ # Author: AZISS # Author: Abijeet Patro # Author: Cekli829 +# Author: Huseyn # Author: Mushviq Abdulla # Author: Ruila # Author: SalihB @@ -17,14 +18,23 @@ az: formats: friendly: '%e %B %Y %H:%M' helpers: + file: + prompt: Fayl seçin submit: diary_comment: create: Qeyd et diary_entry: create: Yayımla + update: Yenilə + issue_comment: + create: Şərh əlavə et message: create: Göndər + client_application: + create: Qeydiyyatdan keç + update: Yenilə trace: + create: Yüklə update: Dəyişiklikləri yadda saxla user_block: create: Blok yarat @@ -38,6 +48,7 @@ az: diary_comment: Gündəliyə şərh diary_entry: Gündəlikdə Yazı friend: Dost + issue: Problem language: Dil message: Mesaj node: Nöqtə @@ -54,6 +65,7 @@ az: relation: Əlaqə relation_member: Əlaqənin İştirakçısı relation_tag: Əlaqənin Teqi + report: Hesabat session: Sessiya trace: Trek tracepoint: Trek Nöqtəsi @@ -65,6 +77,11 @@ az: way_node: Xəttin Nöqtələri way_tag: Xəttin Teqi attributes: + client_application: + name: Ad (Vacib) + support_url: Dəstək linki + allow_read_prefs: Digər istifadəçilərin fikirlərini oxu + allow_write_api: Xəritəni dəyişmək diary_comment: body: Mətn diary_entry: @@ -79,12 +96,14 @@ az: trace: user: İstifadəçi visible: Görünüş - name: Ad + name: Fayl adı size: Ölçüsü latitude: En dairəsi longitude: Uzunluq dairəsi public: İctimai description: İzah + gpx_file: GPX faylı yüklə + visibility: Görünüş tagstring: Etiketlər message: sender: Göndərən @@ -93,6 +112,7 @@ az: recipient: Qəbul edən report: category: Şikayətinizin səbəbini seçin + details: Çətinlik haqqında daha ətraflı danışın (vacib) user: email: E-poçt active: Aktivdir @@ -100,27 +120,37 @@ az: description: İzah languages: Dillər pass_crypt: Parol + pass_crypt_confirmation: Parolu təsdiqlə + help: + trace: + tagstring: Vergül ilə ayrılmış + datetime: + distance_in_words_ago: + half_a_minute: yarım dəqiqə əvvəl editor: default: Susmaya görə (hal-hazırda %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (brauzer üzərindən redaktə) id: name: iD description: iD (brauzerdaxili redaktə) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (brauzer üzərindən redaktə) remote: name: Uzaqdan idarəetmə description: Uzaqdan idarəetmə (JOSM və ya Merkaartor) auth: providers: + none: Heç biri + openid: OpenID google: Google facebook: Facebook windowslive: Windows Live github: GitHub wikipedia: Vikipediya + api: + notes: + rss: + title: OpenStreetMap haqqında qeydlər + entry: + comment: Şərh + full: Tam qeydlər browse: created: Yaradılıb closed: Bağlanıb @@ -226,12 +256,7 @@ az: new: title: Yeni Gündəlik Yazısı form: - subject: 'Mövzu:' - body: 'Mətn:' - language: 'Dil:' location: 'Yerləşdiyi yer:' - latitude: 'En dairəsi:' - longitude: 'Uzunluq dairəsi:' use_map_link: xəritə üzərində göstər index: title: İstifadəçi gündəlikləri @@ -809,19 +834,10 @@ az: signup_confirm: subject: '[OpenStreetMap] OpenStreetMap-ə xoş gəldiniz' greeting: Salam! - email_confirm_plain: + email_confirm: greeting: Salam, - email_confirm_html: - greeting: Salam, - click_the_link: Əgər bu sizsinizsə, zəhmət olmasa, dəyişiklikləri təsdiqləmək - üçün aşağı göstərilmiş istinaddakı ünvana keçin. lost_password: subject: '[OpenStreetMap] Parolu yeniləmək tələbi' - lost_password_plain: - greeting: Salam, - click_the_link: Əgər bu sizsinizsə, zəhmət olmasa, parolunuzu əvəzləmək üçün - aşağı göstərilmiş istinaddakı ünvana keçin. - lost_password_html: greeting: Salam, click_the_link: Əgər bu sizsinizsə, zəhmət olmasa, parolunuzu əvəzləmək üçün aşağı göstərilmiş istinaddakı ünvana keçin. diff --git a/config/locales/ba.yml b/config/locales/ba.yml index 3a1e75b61..e3a29715a 100644 --- a/config/locales/ba.yml +++ b/config/locales/ba.yml @@ -1,8 +1,10 @@ # Messages for Bashkir (башҡортса) # Exported from translatewiki.net # Export driver: phpyaml +# Author: Abijeet Patro # Author: AiseluRB # Author: Lizalizaufa +# Author: MR973 # Author: Roustammr # Author: Sagan # Author: Visem @@ -17,7 +19,36 @@ ba: time: formats: friendly: '%e %B %Y cәғәт %H:%M' + helpers: + file: + prompt: Файлды һайлағыҙ + submit: + diary_comment: + create: Һаҡларға + diary_entry: + create: Баҫтырырға + update: Яңыртырға + issue_comment: + create: Фекер өҫтәргә + message: + create: Ебәреү + client_application: + create: Теркәлеү + update: Яңыртырға + redaction: + create: Төҙәтеүҙе эшләү + update: Төҙәтеүҙе һаҡлау + trace: + create: Тейәү + update: Үҙгәрештәрҙе һаҡларға + user_block: + create: Блок яһау + update: Блокты яңыртыу activerecord: + errors: + messages: + invalid_email_address: Ысын электрон почта адресына оҡшамаған + email_address_not_routable: йүнәлешле түгел models: acl: Инеүҙе сикләү исемлеге changeset: Төҙәтеүҙәр пакеты @@ -26,6 +57,7 @@ ba: diary_comment: Көндәлеккә комментарий diary_entry: Көндәлектәге яҙыу friend: Рәхим итегеҙ! + issue: бурыс language: Тел message: Хәбәр node: Төйөн @@ -42,6 +74,7 @@ ba: relation: Мөнәсәбәт relation_member: Мөнәсәбәттәрҙә ҡатнашыусы relation_tag: Мөнәсәбәт тегы + report: Отчёт session: Сессия trace: Маршрут tracepoint: Маршрут нөктәһе @@ -53,6 +86,18 @@ ba: way_node: Һыҙат нөктәһе way_tag: Һыҙат тегы attributes: + client_application: + name: Исем (Мотлаҡ) + url: Ҡушымта Url (Мотлаҡ) + support_url: Ҡулланыусыларға ярҙам URL + allow_read_prefs: ҡулланыусы көйләүҙәрен уҡыу + allow_write_prefs: ҡулланыусы көйләүҙәрен үҙгәртеү + allow_write_diary: көндәлектә яҙмалар булдырыу, комментарий биреү һәм дуҫтар + табыу + allow_write_api: картаны мөхәррирләү + allow_read_gpx: шәхси GPS-тректарҙы уҡыу + allow_write_gpx: GPS-тректарҙы тейәү + allow_write_notes: яҙмаларҙы төҙәтеү diary_comment: body: Текст diary_entry: @@ -67,17 +112,23 @@ ba: trace: user: Ҡатнашыусы visible: Күренеш - name: Атама + name: Файл исеме size: Күләм latitude: Киңлек longitude: Оҙонлоҡ public: Дөйөм description: Тасуирлау + gpx_file: GPX-файл тейәү + visibility: Күренеүсәнлек + tagstring: Тегтар message: sender: Ебәреүсе title: Тема body: Текст recipient: Алыусы + report: + category: 'Хәбәрегеҙҙең сәбәбен һайлағыҙ:' + details: Зинһар, проблема тураһында бер аҙ тулыраҡ мәғлүмәт бирегеҙ (мотлаҡ). user: email: Электрон почта адресы active: Әүҙем @@ -85,38 +136,110 @@ ba: description: Тасуирлау languages: Телдәр pass_crypt: Серһүҙ + pass_crypt_confirmation: Паролде раҫлағыҙ + help: + trace: + tagstring: өтөр аша + datetime: + distance_in_words_ago: + about_x_hours: + one: яҡынса 1 сәғәт элек + other: яҡынса %{count} сәғәт элек + about_x_months: + one: яҡынса 1 ай элек + other: яҡынса %{count} ай элек + about_x_years: + one: яҡынса 1 йыл элек + other: яҡынса %{count} йыл элек + almost_x_years: + one: 1 йыл элек тиерлек + other: '%{count} йыл элек тиерлек' + half_a_minute: ярты минут элек + less_than_x_seconds: + one: 1 секунд кәм элек + other: '%{count} секунд кәм элек' + less_than_x_minutes: + one: 1 минут кәм элек + other: '%{count} минут кәм элек' + over_x_years: + one: яҡынса 1 йыл элек + other: яҡынса %{count} йыл элек + x_seconds: + one: 1 секунд элек + other: '%{count} секунд элек' + x_minutes: + one: 1 минут элек + other: '%{count} минут элек' + x_days: + one: 1 көн элек + other: '%{count} көн элек' + x_months: + one: 1 ай элек + other: '%{count} ай элек' + x_years: + one: 1 йыл элек + other: '%{count} йыл элек' editor: default: Һайланмаған (ҡуйылған %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (браузерҙағы мөхәррир) id: name: iD description: iD (браузерҙағы мөхәррир) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (браузерҙағы мөхәррир) remote: name: Ситтән тороп идара итеү - description: Ситтән тороп идара итеү (JOSM йәки Merkaartor) + description: Ситтән тороп идара итеү (JOSM, Potlatch, Merkaartor) + auth: + providers: + none: Юҡ + openid: OpenID + google: Google + facebook: Facebook + windowslive: Windows Live + github: GitHub + wikipedia: Википедия + api: + notes: + comment: + opened_at_html: Яһалған %{when} + opened_at_by_html: Яһалған %{when} ҡулланыусы %{user} + commented_at_html: Яңыртылды %{when} + commented_at_by_html: Яңыртылды %{when} ҡулланыусы %{user} + closed_at_html: Эшкәртелгән %{when} + closed_at_by_html: Эшкәртелгән %{when} ҡулланыусы %{user} + reopened_at_html: Кире асылды %{when} + reopened_at_by_html: Кире асылды %{when} ҡулланыусы %{user} + rss: + title: OpenStreetMap Яҙмалары + description_area: Һеҙҙең өлкәлә яһалған, комментарий бирелгән йәки ябылған + яҙмалар исемлеге [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] + description_item: RSS-яҙмалар ағымы %{id} + opened: яңы яҙма (яҡынса %{place}) + closed: ябылған яҙма (яҡынса %{place}) + reopened: яңы асылған яҙма (яҡынса %{place}) + entry: + comment: Комментарий + full: Тулы текст 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} кирегәҡулланыусы - тарафынан%{user} + 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}ҡулланыусы тарафынан%{user} version: Версия in_changeset: Төҙәтеүҙәр пакеты anonymous: Аноним no_comment: (комментарий юҡ) part_of: Ҡатнаша + part_of_relations: + one: 1 мөнәсәбәт + other: '%{count} мөнәсәбәттәр' + part_of_ways: + one: 1 юл + other: '%{count} юлдар' download_xml: ' XML-ды күсереү' view_history: Тарихты ҡарау view_details: Ентекләберәк @@ -127,13 +250,13 @@ ba: node: Нөктәләр (%{count}) node_paginated: Нөктәләр (%{x}-%{y} из %{count}) way: Һыҙыҡтар (%{count}) - way_paginated: Юлдар (%{x}-%{y} %{графа}һынан) + way_paginated: Юлдар (%{x}-%{y} %{count}һынан) relation: Мөнәсәбәттәр (%{count}) - relation_paginated: Бәйләнештәр (%{x}-%{y} %{графа}нан) + relation_paginated: Мөнәсәбәттәр (%{x}-%{y} %{count}нан) comment: Комментарийҙар (%{count}) - hidden_commented_by: ' %{user} %{when}тан йәшерен - комментарий, кирегә' - commented_by: Ҡулланыусы комментарийы %{user} %{when} + hidden_commented_by_html: ' %{user} %{when}тан + йәшерен комментарий, кирегә' + commented_by_html: Ҡулланыусы комментарийы %{user} %{when} кирегә changesetxml: Төҙәтеүҙәр пакетының XML-ы osmchangexml: osmChange XML @@ -142,30 +265,36 @@ ba: title_comment: Төҙәтеүҙәр пакеты %{id} — %{comment} join_discussion: Фекер алышыуға ҡушылыу өсөн системаға инегеҙ discussion: Фекер алышыу + still_open: Төҙәтмәләр пакеты әле асыҡ. Фекер алышыу, төҙәтмәләр пакеты ябылғандан + һуң ғына буласаҡ. node: - title: 'Нөктә: %{name}' - history_title: 'Нөктә тарихы: %{name}' + title_html: 'Нөктә: %{name}' + history_title_html: 'Нөктә тарихы: %{name}' way: - title: 'Һыҙат: %{name}' - history_title: 'Һыҙат тарихы: %{name}' + title_html: 'Һыҙат: %{name}' + history_title_html: 'Һыҙат тарихы: %{name}' nodes: Нөктәләр - also_part_of: + also_part_of_html: one: һыҙатта бар %{related_ways} other: һыҙаттарҙа бар %{related_ways} relation: - title: 'Мөнәсәбәт: %{name}' - history_title: 'Мөнәсәбәт тарихы: %{name}' + title_html: 'Мөнәсәбәт: %{name}' + history_title_html: 'Мөнәсәбәт тарихы: %{name}' members: Ҡатнашыусылар + members_count: + one: 1 ағза + other: '%{count} ағзалар' relation_member: - entry_role: '%{type} %{name} ролендә %{role}' + entry_role_html: '%{type} %{name} ролендә %{role}' type: node: Нөктә way: Һыҙат relation: Мөнәсәбәт containing_relation: - entry: Мөнәсәбәт %{relation_name} - entry_role: Мөнәсәбәт %{relation_name} (ролендә %{relation_role}) + entry_html: Мөнәсәбәт %{relation_name} + entry_role_html: Мөнәсәбәт %{relation_name} (ролендә %{relation_role}) not_found: + title: Табылманы sorry: 'Үкенескә ҡаршы, %{type} #%{id} табылманы.' type: node: Нөктә @@ -174,6 +303,7 @@ ba: changeset: Төҙәтеүҙәр пакеты note: Иҫкәрмә timeout: + title: Тайм-аут Хата sorry: Ғәфү итегеҙ, %{id}-тағы %{type} өсөн мәғлүмәттәр күсереү өсөн бик оҙон. type: node: Нөктә @@ -193,6 +323,7 @@ ba: feature_warning: Объекттарҙың %{num_features}-ын күсереп алыу мотлаҡ, был брауҙерығыҙҙы яйлатыуы мөмкин. Ошо мәғлүмәттәрҙе ысынлап та ҡарарға теләйһегеҙме? load_data: Мәғлүмәттәрҙе күсерергә + loading: Тейәү... tag_details: tags: Тегтар wiki_link: @@ -201,6 +332,7 @@ ba: wikidata_link: Викимәғлүмәттәрҙәге %{page} элементы wikipedia_link: ' Википедиялағы %{page} мәҡәләһе' telephone_link: Шылтыратырға %{phone_number} + colour_preview: Төҫтәрҙе ҡарау %{colour_value} note: title: ' %{id} искәрмәһе' new_note: Яңы мәҡәлә @@ -208,33 +340,34 @@ ba: open_title: 'Эшкәртелмәгән мәҡәлә #%{note_name}' closed_title: 'Эшкәртелгән мәҡәләа #%{note_name}' hidden_title: 'Йәшерелгән яҙма #%{note_name}' - open_by: Ҡулланыусы тарафынан булдырылған %{user} %{when} + opened_by_html: Ҡулланыусы тарафынан булдырылған %{user} %{when} кирегә - open_by_anonymous: Аноним тарафынан булдырылған %{when} + opened_by_anonymous_html: Аноним тарафынан булдырылған %{when} кирегә - commented_by: Ҡулланыусы комментарийы %{user} %{when} + commented_by_html: Ҡулланыусы комментарийы %{user} %{when} кирегә - commented_by_anonymous: Аноним комментарийы %{when} + commented_by_anonymous_html: Аноним комментарийы %{when} кирегә - closed_by: Ҡулланыусы тарафынан эшкәртелгән %{user} %{when} + closed_by_html: Ҡулланыусы тарафынан эшкәртелгән %{user} %{when} кирегә - closed_by_anonymous: Аноним тарафынан рөхсәт ителгән %{when} + closed_by_anonymous_html: Аноним тарафынан рөхсәт ителгән %{when} кирегә - reopened_by: Ҡулланыусы тарафынан ҡабаттан асылған %{user} %{when} + reopened_by_html: Ҡулланыусы тарафынан ҡабаттан асылған %{user} %{when} кирегә - reopened_by_anonymous: Аноним тарафынан ҡабаттан асылған %{when} + reopened_by_anonymous_html: Аноним тарафынан ҡабаттан асылған %{when} кирегә - hidden_by: Йәшерелгән %{user} %{when} кирегә + hidden_by_html: Йәшерелгән %{user} %{when} кирегә + report: Был яҙма тураһында хәбәр итеү query: title: Объекттар тураһында мәғлүмәт introduction: Яҡындағы объекттарҙы табыу өсөн картаға баҫығыҙ nearby: Яҡындағы объекттар enclosing: Урыны - changeset: + changesets: changeset_paging_nav: showing_page: ' %{page} бите' next: Киләһе » - previous: Алдағы + previous: « Алдағы changeset: anonymous: Аноним no_edits: (төҙәтеүҙәр юҡ) @@ -248,11 +381,11 @@ ba: index: title: Төҙәтеүҙәр пакеты title_user: ' %{user} ҡулланыусыһының төҙәтеүҙәр пакеты' - title_friend: Дуҫтарығыҙҙың төҙәтеүҙәре пакеты - title_nearby: Эргәләге ҡатнашыусыларҙың төҙәтеүҙәре пакеты - empty: Төҙәтеүҙәр пакеты табылманы - empty_area: Был өлкәлә төҙәтеүҙәр пакеты юҡ - empty_user: Был ҡулланыусының төҙәтеүҙәре пакеы юҡ + title_friend: Дуҫтарҙың төҙәтеүҙәр пакеты + title_nearby: Эргәләге ҡатнашыусыларҙың төҙәтеүҙәр пакеты + empty: Төҙәтеүҙәр пакеты табылманы. + empty_area: Был өлкәлә төҙәтеүҙәр пакеты юҡ. + empty_user: Был ҡулланыусының төҙәтеүҙәр пакеы юҡ. no_more: Башҡаса бер ниндәй ҙә төҙәтеүҙәр пакеты табылманы no_more_area: Был өлкәлә башҡа төҙәтеүҙәр пакеты юҡ no_more_user: Был ҡулланыусының башҡа төҙәтеүҙәре пакеы юҡ @@ -260,17 +393,18 @@ ba: timeout: sorry: Үкенескә күрә, һеҙ һораған төҙәтеүҙәр пакеты исемлеге күсереү өсөн бик оҙон - rss: + changeset_comments: + comment: + commented_at_by_html: Яңыртылған%{}элек %{ҡулланыусы}тарафынан + index: title_all: OpenStreetMap төҙәтеүҙәр пакеты буйынса фекерләшеү title_particular: ' OpenStreetMap #%{changeset_id} төҙәтеүҙәр пакеты буйынса фекерләшеү' - commented_at_html: Яңыртылған%{}элек - commented_at_by_html: Яңыртылған%{}элек %{ҡулланыусы}тарафынан - full: Бөтөн фекерләшеү - diary_entry: + diary_entries: new: title: Яңы көндәлеккә инеү - publish_button: Баҫтырырға + form: + use_map_link: картаны ҡуллан index: title: Көндәлектәр title_friends: Дуҫтарың көндәлектәре @@ -284,25 +418,19 @@ ba: newer_entries: Яңыраҡ яҙмалар edit: title: Яҙманы мөхәррирләү - body: Нигеҙ текст - language: 'Тел:' - latitude: Географик киңлек - longitude: Географик оҙонлоҡ - use_map_link: картаны ҡуллан - save_button: Һаҡларға marker_text: Көндәлек яҙыу урыны show: title: '%{ҡулланыусы}ның көндәлеге|%{титул}' user_title: '%{ҡулланыусы}ның көндәлеге' leave_a_comment: Фекер ҡалдыр - login_to_leave_a_comment: Фекер яҙыу өсөн %{login_link} + login_to_leave_a_comment_html: Фекер яҙыу өсөн %{login_link} no_such_entry: title: Бындай көндәлек яҙыуы юҡ heading: '%{id} шәхси яҙыуына инеп булмай' body: Ҡыҙғанысҡа ҡаршы, %{id}шәхси яҙыуы йәки фекере табылманы. Дөрөҫ яҙылышын тикшер. Яңылыш ссылкаға күскәнһең, ахыры. diary_entry: - posted_by: Ебәрҙем%{link_user}%{created}, тел:%{language_link} + posted_by_html: Ебәрҙем%{link_user}%{created}, тел:%{language_link} comment_link: Фекереңде яҙ reply_link: Инеүеңде раҫла comment_count: @@ -310,7 +438,7 @@ ba: edit_link: Был яҙманы үҙгәрт hide_link: Был яҙманы йәшер diary_comment: - comment_from: '%{link_user}тарафынан%{comment_created_at}көндө ҡаралған' + comment_from_html: '%{link_user}тарафынан%{comment_created_at}көндө ҡаралған' hide_link: Был фекерҙе йәшереү feed: user: @@ -327,24 +455,23 @@ ba: яҙҙы' post: Йәшереү when: ҡасан - ago: '%{ago}элек' newer_comments: Яңыраҡ фекерҙәр older_comments: Иҫкерәк фекерҙәр geocoder: search: title: - latlon: |2- + latlon_html: |2- эсендәге һөҙөмтәләр - ca_postcode: NPEMap / FreeThe Postcodeалынған + ca_postcode_html: NPEMap / FreeThe Postcodeалынған һөҙөмтәләр - osm_nominatim: OpenStreetMap + osm_nominatim_html: OpenStreetMap Nominatimнан сыҡҡан һөҙөмтәләр - geonames: GeoNamesнан сыҡҡан һөҙөмтәләр - osm_nominatim_reverse: OpenStreetMap + geonames_html: GeoNamesнан сыҡҡан һөҙөмтәләр + osm_nominatim_reverse_html: OpenStreetMap Nominatimнан һөҙөмтәләр - geonames_reverse: GeoNamesнан сыҡҡан - һөҙөмтәләр + geonames_reverse_html: GeoNamesнан + сыҡҡан һөҙөмтәләр search_osm_nominatim: prefix: aerialway: @@ -418,19 +545,15 @@ ba: police: Полиция post_box: Почта йәшниге post_office: Почта бүлексәһе - preschool: Мәктәпкәсә уҡытыу учреждениеһы prison: Төрмә pub: Һырахана public_building: Йәмғиәти бина recycling: Киренән эшкәртеү урыны restaurant: Ресторан - retirement_home: Ҡарттар йорто - sauna: Сауна school: Мәктәп shelter: Йәшенеү урыны shower: Душ social_centre: Йәмғиәти үҙәк - social_club: Берләшмә social_facility: Йәмәғәт ойошмаһы studio: Студия swimming_pool: Бассейн @@ -445,7 +568,6 @@ ba: village_hall: Утар waste_basket: Сүп һауыты waste_disposal: ҡалдыҡтарҙы юҡ итеү - youth_centre: Йәштәр үҙәге boundary: administrative: административ сик census: иҫәп алыу участогының сиге @@ -511,7 +633,6 @@ ba: tertiary_link: Сиҙәм юлы track: Ауыл юлы traffic_signals: Светофор - trail: Һуҡмаҡ trunk: Төп юл trunk_link: Магистраль unclassified: Урындағы юл @@ -528,7 +649,6 @@ ba: fort: Ҡойма heritage: Мәҙәни мираҫ house: Йорт - icon: Тәре manor: Поместье memorial: Һәйкәл mine: Карьер @@ -570,7 +690,6 @@ ba: reservoir_watershed: Һыу һаҡлағыстың һыу айырсаһы residential: Йәшәү районы retail: Һатыу итеү биләмәһе - road: Юл селтәре зонаһы village_green: Йәшел ауыл vineyard: Йөҙөм баҡсаһы "yes": Ерҙе ҡулланыу diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml index 9969eac9c..0baa4d6c9 100644 --- a/config/locales/be-Tarask.yml +++ b/config/locales/be-Tarask.yml @@ -26,7 +26,7 @@ be-Tarask: create: Даслаць client_application: create: Рэгістрацыя - update: Рэдагаваць + update: Абнавіць redaction: create: Стварыць рэдакцыю update: Захаваць рэдакцыю @@ -79,6 +79,8 @@ be-Tarask: way_tag: Тэг дарогі attributes: client_application: + name: Імя (абавязкова) + url: Асноўны URL праграмы (абавязкова) callback_url: URL-адрас зваротнага выкліку support_url: URL-адрас падтрымкі diary_comment: @@ -95,15 +97,15 @@ be-Tarask: trace: user: Карыстальнік visible: Бачны - name: Назва + name: Назва файлу size: Памер latitude: Шырата longitude: Даўгата public: Публічны description: Апісаньне - gpx_file: 'Загрузіць GPX-файл:' - visibility: 'Бачнасьць:' - tagstring: 'Тэгі:' + gpx_file: Загрузіць GPX-файл + visibility: Бачнасьць + tagstring: Тэгі message: sender: Адпраўшчык title: Тэма @@ -160,15 +162,9 @@ be-Tarask: other: '%{count} гады таму' editor: default: Па змоўчваньні (цяпер %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (рэдактар у браўзэры) id: name: iD description: iD (рэдактар у браўзэры) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (рэдактар у браўзэры) remote: name: Аддаленае кіраваньне description: Аддаленае кіраваньне (JOSM ці Merkaartor) @@ -194,6 +190,13 @@ be-Tarask: reopened_at_by_html: Пераадкрыта %{when} удзельнікам %{user} rss: title: Нататкі OpenStreetMap + description_area: Сьпіс заўвагаў, створаных, пракамэнтаваных ці закрытых каля + вас [(%{min_lat}|%{min_lon}) — (%{max_lat}|%{max_lon})] + description_item: RSS-стужка для заўвагаў %{id} + opened: новая нататка (каля %{place}) + commented: новы камэнтар (каля %{place}) + closed: закрытая нататка (каля %{place}) + reopened: пераадкрытая нататка (каля %{place}) entry: full: Поўны тэкст browse: @@ -288,12 +291,7 @@ be-Tarask: new: title: Новы запіс у дзёньніку form: - subject: 'Тэма:' - body: 'Тэкст:' - language: 'Мова:' location: 'Месцазнаходжаньне:' - latitude: 'Шырата:' - longitude: 'Даўгата:' use_map_link: на мапе index: title: Дзёньнікі карыстальнікаў @@ -323,9 +321,9 @@ be-Tarask: Калі ласка, праверце дакладнасьць напісаньня, ці, магчыма, спасылка па якой Вы перайшлі, няслушная. diary_entry: - posted_by_html: Дасланы %{link_user} %{created} на %{language_link} + posted_by_html: Дасланы %{link_user} %{created} на %{language_link}. comment_link: Камэнтаваць гэты запіс - reply_link: Адказаць на гэты запіс + reply_link: Адаслаць аўтару паведамленьне comment_count: few: '%{count} камэнтары' one: '%{count} камэнтар' @@ -447,15 +445,15 @@ be-Tarask: national_park: Нацыянальны парк protected_area: Ахоўная зона building: - apartments: Шматкватэрны дом + apartments: Апартамэнты chapel: Капліца - church: Царква + church: Будынак храму commercial: Камэрцыйны будынак dormitory: Інтэрнат - farm: Фэрма + farm: Дом на фэрме garage: Гараж hospital: Будынак шпіталю - hotel: Гатэль + hotel: Будынак гатэлю house: Дом industrial: Прамысловы будынак office: Офісны будынак @@ -463,8 +461,8 @@ be-Tarask: residential: Жылы будынак retail: Будынак розьнічнага гандлю school: Школа - terrace: Шэраг жылых дамоў - train_station: Чыгуначная станцыя + terrace: Шэраг жылых будынкаў + train_station: Будынак чыгуначнай станцыі university: Унівэрсытэт highway: bridleway: Дарога для коней @@ -825,26 +823,12 @@ be-Tarask: subject: '[OpenStreetMap] Вітаем у OpenStreetMap' email_confirm: subject: '[OpenStreetMap] Пацьвердзіце Ваш адрас электроннай пошты' - email_confirm_plain: greeting: Вітаем, click_the_link: Калі гэта Вы, калі ласка, націсьніце на спасылку ніжэй, каб пацьвердзіць зьмену. - email_confirm_html: - greeting: Вітаем, - hopefully_you: Нехта (спадзяемся што Вы) жадае зьмяніць свой адрас электроннай - пошты ў %{server_url} на %{new_address}. - click_the_link: Калі гэта Вы, калі ласка, націсьніце на спасылку ніжэй, каб - пацьвердзіць зьмену. lost_password: subject: '[OpenStreetMap] Запыт на зьмену паролю' - lost_password_plain: - greeting: Вітаем, - click_the_link: Калі гэта Вы, калі ласка, націсьніце на спасылку ніжэй, каб - скінуць Ваш пароль. - lost_password_html: greeting: Вітаем, - hopefully_you: Нехта (магчыма Вы) запытаў зьмену паролю для гэтага адрасу электроннай - пошты openstreetmap.org. click_the_link: Калі гэта Вы, калі ласка, націсьніце на спасылку ніжэй, каб скінуць Ваш пароль. messages: @@ -1012,18 +996,6 @@ be-Tarask: Вы можаце зрабіць Вашыя рэдагаваньні публічнымі на Вашай %{user_page}. user_page_link: старонцы карыстальніка anon_edits_link_text: Даведацца ў чым справа. - flash_player_required_html: Каб выкарыстоўваць Potlatch, флэш-рэдактар для OpenStreetMap, - неабходны Flash-плэер. Вы можаце загрузіць - Flash-плэер з Adobe.com. Існуюць і іншыя - магчымасьці для рэдагаваньня OpenStreetMap. - potlatch_unsaved_changes: Вы маеце незахаваныя зьмены. (Для таго каб захаваць - зьмены ў Potlatch, Вам неабходна зьняць пазначэньне з цяперашняй дарогі ці - пункту, калі рэдагуеце ўжывую, ці націснуць кнопку «захаваць».) - potlatch2_not_configured: Potlatch 2 ня быў наладжаны — калі ласка, паглядзіце - https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 дзеля дадатковых - зьвестак - potlatch2_unsaved_changes: Вы маеце незахаваныя зьмены. (Каб захаваць у Potlatch - 2, Вам неабходна націснуць кнопку «захаваць».) no_iframe_support: Ваш браўзэр не падтрымлівае рамкі HTML, якія зьяўляюцца неабходнымі для гэтай магчымасьці. export: @@ -1561,7 +1533,7 @@ be-Tarask: revoke: title: Пацьвердзіць адмену ролі heading: Пацьвердзіць адмену ролі - are_you_sure: Вы ўпэўнены, што жадаеце адмяніць ролю `%{role}' удзельніка `%{name}'? + are_you_sure: Вы ўпэўнены, што жадаеце скасаваць ролю `%{role}' удзельніка `%{name}'? confirm: Пацьвердзіць fail: Не магчыма адмяніць ролю `%{role}' удзельніка `%{name}'. Калі ласка, праверце каб удзельнік і роля былі слушнымі. diff --git a/config/locales/be.yml b/config/locales/be.yml index 7cfe7bd0c..e339ab8a5 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -7,6 +7,7 @@ # Author: Goshaproject # Author: Jhnrvr # Author: Jim-by +# Author: Kareyac # Author: Macofe # Author: Maksim L. # Author: Mechanizatar @@ -197,15 +198,9 @@ be: other: '%{count} гады(оў) таму' editor: default: Тыповы (зараз %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (браўзэрны рэдактар) id: name: iD description: iD (браўзэрны рэдактар) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (браўзэрны рэдактар) remote: name: Вонкавы рэдактар description: вонкавага рэдактара (JOSM або Merkaartor) @@ -414,12 +409,7 @@ be: new: title: Новы запіс дзённіку form: - subject: 'Тэма:' - body: 'Змест:' - language: 'Мова:' location: 'Месца:' - latitude: 'Шырата:' - longitude: 'Даўгата:' use_map_link: карыстацца картай index: title: Дзённікі карыстальнікаў @@ -1272,13 +1262,6 @@ be: інфармацыю. email_confirm: subject: '[OpenStreetMap] Пацвердзіце ваш адрас электроннай пошты' - email_confirm_plain: - greeting: Добры дзень, - hopefully_you: 'Хтосьці (спадзяемся, што вы) жадае змяніць свой адрас электроннай - пошты ў %{server_url} на адрас: %{new_address}.' - click_the_link: Калі гэта вы, то перайдзіце па спасылцы, размешчанай ніжэй, - каб пацвердзіць змену. - email_confirm_html: greeting: Добры дзень, hopefully_you: 'Хтосьці (спадзяемся, што вы) жадае змяніць свой адрас электроннай пошты ў %{server_url} на адрас: %{new_address}.' @@ -1286,18 +1269,11 @@ be: каб пацвердзіць змену. lost_password: subject: '[OpenStreetMap] Запыт на змену пароля' - lost_password_plain: - greeting: Прывітанне, + greeting: Добры дзень, hopefully_you: Хтосьці (спадзяемся, што вы) запытаў змену пароля для рахунка на openstreetmap.org, прывязанага да гэтага адраса электроннай пошты. click_the_link: Калі гэта вы, калі ласка, перайдзіце па спасылцы, паказанай ніжэй, каб змяніць ваш пароль. - lost_password_html: - greeting: Прывітанне, - hopefully_you: Хтосьці (магчыма, вы) запытаў змену пароля для рахунка на openstreetmap.org, - які выкарыстоўвае гэты адрас электроннай пошты. - click_the_link: Калі гэта вы, калі ласка, перайдзіце па спасылцы, паказанай - ніжэй, каб змяніць ваш пароль. note_comment_notification: anonymous: Ананімны карыстальнік greeting: Прывітанне, @@ -1416,6 +1392,14 @@ be: as_unread: Паведамленне адмечана нечытаным destroy: destroyed: Паведамленне выдалена + shared: + markdown_help: + subheading: Падзагаловак + link: Спасылка + text: Тэкст + image: Выява + richtext_field: + edit: Правіць site: about: next: Далей @@ -1592,17 +1576,6 @@ be: Вы можаце зрабіць Вашыя рэдагаваньні публічнымі на Вашай %{user_page}. user_page_link: старонка карыстальніка anon_edits_link_text: Даведацца ў чым справа. - flash_player_required_html: Каб выкарыстоўваць рэдактар Potlatch неабходны Flash-плэер. - Вы можаце загрузіць Flash-плэер - з Adobe.com. Існуюць і іншыя - магчымасці для рэдагавання OpenStreetMap. - potlatch_unsaved_changes: Маюцца незахаваныя змены. (Для захавання ў Potlatch - зніміце вылучэнне з лініі або пункта, калі рэдагуеце ў «жывым» рэжыме, альбо - націсніце кнопку «захаваць», калі вы ў рэжыме адкладзенага захавання.) - potlatch2_not_configured: Potlatch 2 не быў наладжаны. Калі ласка, паглядзіце - https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 - potlatch2_unsaved_changes: Вы маеце незахаваныя змены. (Каб захаваць у Potlatch - 2, Вам неабходна націснуць кнопку «захаваць».) id_not_configured: iD не быў настроены no_iframe_support: Ваш браўзэр не падтрымлівае HTML iframe, якія неабходныя для гэтай функцыі. diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 91069d8e5..b858daf3a 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -3,6 +3,7 @@ # Export driver: phpyaml # Author: Abijeet Patro # Author: DCLXVI +# Author: Kareyac # Author: Lyubomirv # Author: MrPanyGoff # Author: Plamen @@ -177,15 +178,9 @@ bg: other: преди %{count} години editor: default: По подразбиране (в момента %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (редактор в браузъра) id: name: iD description: iD (редактиране в браузър) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (редактиране в браузър) remote: name: Дистанционно управление description: Дистанционно управление (JOSM или Merkaartor) @@ -388,12 +383,7 @@ bg: new: title: Нова публикация в дневника form: - subject: 'Тема:' - body: 'Текст:' - language: 'Език:' location: 'Местоположение:' - latitude: 'Географска ширина:' - longitude: 'Географска дължина:' use_map_link: използвай карта index: title: Дневници на потребителите @@ -1214,13 +1204,6 @@ bg: welcome: След като потвърдите ще ви изпратим още повече информация как да започнете. email_confirm: subject: '[OpenStreetMap] Потвърждаване на адрес за електронна поща' - email_confirm_plain: - greeting: Здравейте, - hopefully_you: 'Някой (надяваме се Вие) желае да промени адреса на електронната - си поща намиращ се на %{server_url} с адрес: %{new_address}.' - click_the_link: Ако това сте Вие, моля, посетете препратката за потвърждение - на промяната. - email_confirm_html: greeting: Здравейте, hopefully_you: 'Някой (надяваме се Вие) желае да промени адреса на електронната си поща намиращ се на %{server_url} с адрес: %{new_address}.' @@ -1228,12 +1211,6 @@ bg: на промяната. lost_password: subject: '[OpenStreetMap] Заявка за промяна на парола' - lost_password_plain: - greeting: Здравейте, - hopefully_you: Някой (надяваме се Вие) е поискал промяна на паролата на сметка - в openstreetmap.org свързана този адрес на електронна поща. - click_the_link: Ако това сте Вие, моля, посетете препратката за промяна на паролата. - lost_password_html: greeting: Здравейте, hopefully_you: Някой (надяваме се Вие) е поискал промяна на паролата на сметка в openstreetmap.org свързана този адрес на електронна поща. @@ -1332,6 +1309,15 @@ bg: as_unread: Съобщението е отбелязано като непрочетено destroy: destroyed: Съобщението беше изтрито + shared: + markdown_help: + headings: Заглавия + text: Текст + image: Изображение + alt: Алтернативен текст + richtext_field: + edit: Редактиране + preview: Предварителен преглед site: about: next: Напред diff --git a/config/locales/bn.yml b/config/locales/bn.yml index fad9e4398..9e3de071a 100644 --- a/config/locales/bn.yml +++ b/config/locales/bn.yml @@ -182,15 +182,9 @@ bn: other: '%{count} বছর আগে' editor: default: পূর্বনির্ধারিত (বর্তমানে %{name}) - potlatch: - name: পটল্যাচ ১ - description: পটল্যাচ ১ (ব্রাউজার থেকে সম্পাদনা) id: name: আইডি description: আইডি (ব্রাউজার থেকে সম্পাদনা) - potlatch2: - name: পটল্যাচ ২ - description: পটল্যাচ ২ (ব্রাউজার থেকে সম্পাদনা) remote: name: রিমোট কন্ট্রোল description: রিমোট কন্ট্রোল (JOSM অথবা Merkaartor) @@ -392,12 +386,7 @@ bn: new: title: নতুন দিনলিপির ভুক্তি form: - subject: 'বিষয়:' - body: 'মূলাংশ:' - language: 'ভাষা:' - location: 'অবস্থান:' - latitude: 'অক্ষাংশ:' - longitude: 'দ্রাঘিমাংশ:' + location: অবস্থান use_map_link: মানচিত্র ব্যবহার করুন index: title: ব্যবহারকারীর দিনলিপি @@ -1108,23 +1097,11 @@ bn: করেছেন। email_confirm: subject: '[OpenStreetMap] আপনার ইমেইল ঠিকানা নিশ্চিত করুন' - email_confirm_plain: - greeting: সুপ্রিয়, - click_the_link: এটি যদি আপনি হন, দয়া করে পরিবর্তন নিশ্চিত করতে নিচের লিংকে - ক্লিক করুন। - email_confirm_html: greeting: সুপ্রিয়, click_the_link: এটি যদি আপনি হন, দয়া করে পরিবর্তন নিশ্চিত করতে নিচের লিংকে ক্লিক করুন। lost_password: subject: '[ওপেনস্ট্রিটম্যাপ] পাসওয়ার্ড পুনঃধার্য করার অনুরোধ' - lost_password_plain: - greeting: সুপ্রিয়, - hopefully_you: কোনো একজন (সম্ভবত আপনি) এই ইমেইল ঠিকানার সাথে যুক্ত openstreetmap.org - অ্যাকাউন্টের পাসওয়ার্ড পরিবর্তনের অনুরোধ করেছেন। - click_the_link: এটি যদি আপনি হন, তবে পাসওয়ার্ড পুনঃধার্য করতে দয়া করে নিচের - লিংকে ক্লিক করুন। - lost_password_html: greeting: সুপ্রিয়, hopefully_you: কোনো একজন (সম্ভবত আপনি) এই ইমেইল ঠিকানার সাথে যুক্ত openstreetmap.org অ্যাকাউন্টের পাসওয়ার্ড পরিবর্তনের অনুরোধ করেছেন। @@ -1201,6 +1178,23 @@ bn: as_unread: বার্তা অপঠিত হিসেবে চিহ্নিত করুন destroy: destroyed: বার্তা মোছা হয়েছে + shared: + markdown_help: + title_html: kramdown + দিয়ে পার্সকৃত + headings: শিরোনামগুলি + heading: শিরোনাম + subheading: উপশিরোনাম + first: প্রথম আইটেম + second: দ্বিতীয় আইটেম + link: সংযোগ + text: পাঠ্য + image: ছবি + alt: বিকল্প পাঠ্য + url: ইউআরএল + richtext_field: + edit: সম্পাদনা + preview: প্রাকদর্শন site: about: next: পরবর্তী diff --git a/config/locales/br.yml b/config/locales/br.yml index 41b94c999..46e09f74b 100644 --- a/config/locales/br.yml +++ b/config/locales/br.yml @@ -196,15 +196,9 @@ br: other: '%{count} bloaz zo' editor: default: Dre ziouer (%{name} er mare-mañ) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (aozer enframmet er merdeer) id: name: iD description: iD (aozer e-barzh ar merdeer) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (aozer enframmet er merdeer) remote: name: Aozer diavaez description: Aozer diavaez (JOSM pe Merkaartor) @@ -418,12 +412,7 @@ br: new: title: Enmoned nevez en deizlevr form: - subject: 'Danvez:' - body: 'Korf:' - language: 'Yezh:' location: 'Lec''hiadur:' - latitude: 'Lec''hed:' - longitude: 'Hedred:' use_map_link: implijout ar gartenn index: title: Deizlevrioù an implijerien @@ -1297,32 +1286,18 @@ br: deoc'h evit kregiñ ganti. email_confirm: subject: '[OpenStreetMap] Kadarnaat ho chomlec''h postel' - email_confirm_plain: greeting: Demat, hopefully_you: Unan bennak (c'hwi moarvat) a garfe cheñch e chomlec'h postel eus %{server_url} da %{new_address}. click_the_link: Ma'z eo c'hwi, klikit war al liamm amañ dindan, mar plij, evit kadarnaat ar c'hemm. - email_confirm_html: - greeting: Demat, - hopefully_you: Unan bennak (c'hwi moarvat) a garfe cheñch e chomlec'h postel - eus %{server_url} da %{new_address}. - click_the_link: Ma'z eo c'hwi, klikit war al liamm amañ dindan evit kadarnaat - ar c'hemm. lost_password: subject: '[OpenStreetMap] Goulenn adderaouekaat ar ger-tremen' - lost_password_plain: greeting: Demat, hopefully_you: Unan bennak (c'hwi moarvat) en deus goulennet e vefe adderaouekaet ar ger-tremen evit ar chomlec'h postel-mañ war ar gont openstreetmap.org click_the_link: Ma'z eo c'hwi, klikit war al liamm amañ dindan, mar plij, evit adderaouekaat ho ker-tremen. - lost_password_html: - greeting: Demat, - hopefully_you: Unan bennak (c'hwi moarvat) en deus goulennet e vefe adderaouekaet - ger-tremen ar gont openstreetmap.org gant ar chomlec'h postel-mañ. - click_the_link: Ma'z eo c'hwi, klikit war al liamm amañ dindan evit adderaouekaat - ho ker-tremen. note_comment_notification: anonymous: Un implijer dizanv greeting: Demat, @@ -1614,17 +1589,6 @@ br: vezañ foran diwar ho %{user_page}. user_page_link: pajenn implijer anon_edits_link_text: Kavit perak. - flash_player_required_html: Ezhomm hoc'h eus eus ul lenner Flash evit implijout - Potlatch, aozer flash OpenStreetMap. Gallout a rit pellgargañ - Flash Player diwar Adobe.com. Meur - a zibarzh a c'haller kaout evit kemmañ OpenStreetMap. - potlatch_unsaved_changes: Kemmoù n'int ket bet enrollet zo ganeoc'h. (Evit enrollañ - e Potlatch, e tlefec'h diziuzañ an hent pe ar poent red m'emaoc'h oc'h aozañ - er mod bev, pe klikañ war enrollañ ma vez ur bouton enrollañ ganeoc'h.) - potlatch2_not_configured: Potlatch 2 n'eo ket bet kefluniet - sellit ouzh https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 - da c'houzout hiroc'h - potlatch2_unsaved_changes: Kemmoù n'int ket enrollet zo ganeoc'h. (Evit enrollañ - ho kemmoù e Potlach2, klikit war enrollañ) id_not_configured: N'eo ket bet kefluniet an ID no_iframe_support: N'eo ket ho merdeer evit ober gant iframmoù HTML, hag ezhomm zo eus ar re-se evit an arc'hweladur-mañ. diff --git a/config/locales/bs.yml b/config/locales/bs.yml index 51aabdd6a..92b211dbb 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -119,15 +119,9 @@ bs: tagstring: odvojeno zarezima editor: default: Zadano (currently %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (uređivač unutar web preglednika) id: name: iD description: iD (uređivač u pregledniku) - potlatch2: - name: Potlatch 2 - description: Potlatch 1 (uređivač unutar web preglednika) remote: name: Udaljena kontrola description: Udaljena kontrola (JOSM ili Merkaartor) @@ -252,12 +246,7 @@ bs: new: title: Novi unos u dnevnik form: - subject: 'Predmet:' - body: 'Tijelo:' - language: 'Jezik:' location: 'Lokacija:' - latitude: Geografska širina (Latitude) - longitude: Geografska dužina (Longitude) use_map_link: korisititi kartu index: title: Dnevnici korisnika @@ -886,25 +875,12 @@ bs: kako bi ste počeli. email_confirm: subject: '[OpenStreetMap] Potvrdite Vašu e-mail adresu' - email_confirm_plain: greeting: Zdravo, click_the_link: Ako ste ovo Vi, molimo klinknite na poveznicu ispod da potvrdite promjene. - email_confirm_html: - greeting: Zdravo, - hopefully_you: Netko (nadamo se Vi) bi želio promjeniti svoju e-mail adresu - sa %{server_url} na %{new_address}. - click_the_link: Ako ste ovo Vi, kliknite na link naveden ispod za potvrdu promjene lost_password: subject: '[OpenStreetMap] Zahtjev za ponovnim postavljanjem lozinke' - lost_password_plain: - greeting: Zdravo, - click_the_link: Ako ste ovo Vi, kliknite na link ispod za ponovno postavljanje - lozinke. - lost_password_html: greeting: Zdravo, - hopefully_you: Neko (moguće, Vi) je pitao za ponovno postavljanje lozinke na - njihovim e-mail adresama openstreetmap.org računa. click_the_link: Ako ste ovo Vi, kliknite na link ispod za ponovno postavljanje lozinke. note_comment_notification: @@ -1101,16 +1077,6 @@ bs: Možete promjeniti Vaše promjene u javne sa %{user_page}. user_page_link: korisnička stranica anon_edits_link_text: Otkrijte zašto je to tako. - flash_player_required_html: Potreban Vam je Flash player da bi koristili Potlatch, - OpenStreetMap Flash uređivač. Možete preuzeti - Adobe Flash Player sa Adobe.com. Neke - druge mogućnosti su takođe dostupne za uređivanje OpenStreetMap-a. - potlatch_unsaved_changes: Imate nespremljene promjene. (Da bi ste spremili u - Potlatch-u, morate odznačiti trenutnu putanju ili tačku, ako uređujete uživo; - ili kliknite SPREMITI ako imate to dugme.) - potlatch2_not_configured: Potlatch 2 nije konfiguriran - molimo pogledajte http://wiki.openstreetmap.org/wiki/The_Rails_Port - potlatch2_unsaved_changes: Imate nespremljene promjene. (Da bi ste spremili - u Potlatch 2, trebali bi kliknuti Spremiti.) no_iframe_support: Vaš preglednik ne podržava HTML iframes, koji su potrebni za ovu značajku. export: diff --git a/config/locales/ca.yml b/config/locales/ca.yml index e91c4f745..045ea43b2 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -210,15 +210,9 @@ ca: with_version: '%{id}, v%{version}' editor: default: Predeterminat (actualment %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (editor integrat en el navegador) id: name: iD description: iD (editor integrat en el navegador) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (editor integrat en el navegador) remote: name: Control remot description: Control remot (JOSM o Merkaartor) @@ -436,13 +430,8 @@ ca: new: title: Entrada de diari nova form: - subject: 'Assumpte:' - body: 'Cos del missatge:' - language: 'Idioma:' - location: 'Ubicació:' - latitude: 'Latitud:' - longitude: 'Longitud:' - use_map_link: usa el mapa + location: Ubicació + use_map_link: Useu el mapa index: title: Diaris dels usuaris title_friends: Diaris d'amics @@ -471,7 +460,8 @@ ca: body: No hi ha cap entrada o comentari en el diari amb l'id %{id}. Si us plau, comproveu-ne l'ortografia. O potser l'enllaç que heu clicat no és correcte. diary_entry: - posted_by_html: Publicat per %{link_user} el %{created} en %{language_link} + posted_by_html: Publicat per %{link_user} el %{created} en %{language_link}. + updated_at_html: Última actualització de %{updated} comment_link: Comenta aquesta entrada reply_link: Enviar un missatge a l'autor comment_count: @@ -1404,12 +1394,21 @@ ca: hi: Hola %{to_user}, header: '%{from_user} ha comentat l''entrada de diari de l''OpenStreetMap amb el tema %{subject}:' + header_html: '%{from_user} ha comentat l''entrada de diari de l''OpenStreetMap + amb el tema %{subject}:' footer: Pots també llegit el comentari a %{readurl} i pots comentar a %{commenturl} o enviar un missatge a l'autor a %{replyurl} + footer_html: També podeu llegir el comentari a %{readurl} i comentar-lo a %{commenturl} + o enviar un missatge a l'autor a %{replyurl} message_notification: + subject: '[OpenStreetMap] %{message_title}' hi: Hola %{to_user}, header: '%{from_user} ha enviat un missatge a través d''OpenStreetMap amb el tema %{subject}:' + header_html: '%{from_user} us ha enviat un missatge a través d''OpenStreetMap + amb el tema %{subject}:' + footer: També podeu llegir el missatge a %{readurl} i podeu enviar un missatge + a l'autor a %{replyurl} footer_html: També podeu llegir el missatge a %{readurl} i podeu enviar un missatge a l'autor a %{replyurl} friendship_notification: @@ -1417,10 +1416,19 @@ ca: subject: '[OpenStreetMap] %{user} us ha afegit a la llista d''amics' had_added_you: '%{user} us ha afegit com a amic a l''OpenStreetMap.' see_their_profile: Podeu veure el seu perfil a %{userurl}. + see_their_profile_html: Podeu veure el seu perfil a %{userurl}. befriend_them: També el podeu afegir com a amic a %{befriendurl}. + befriend_them_html: També el podeu afegir com a amic a %{befriendurl}. + gpx_description: + description_with_tags_html: 'Sembla que el vostre fitxer GPX %{trace_name} amb + la descripció %{trace_description} i les etiquetes següents: %{tags}' + description_with_no_tags_html: Sembla que el vostre fitxer GPX %{trace_name} + amb la descripció %{trace_description} i sense etiquetes gpx_failure: hi: Hola %{to_user}, failed_to_import: 'no es pot importar. L''error ha estat:' + more_info_html: Podeu trobar més informació sobre les fallades d'importació + de GPX i com per evitar-les a %{url}. subject: '[OpenStreetMap] Error d''importació de GPX' gpx_success: hi: Hola %{to_user}, @@ -1439,13 +1447,6 @@ ca: començar. email_confirm: subject: '[OpenStreetMap] Confirmeu l''adreça de correu' - email_confirm_plain: - greeting: Hola, - hopefully_you: Algú (esperem que vós) vol canviar la vostra adreça electrònica - a %{server_url} per %{new_address}. - click_the_link: Si sou vós mateix, feu clic a l'enllaç de sota per confirmar - el canvi. - email_confirm_html: greeting: Hola, hopefully_you: Algú (esperem que vós) vol canviar la vostra adreça electrònica a %{server_url} per %{new_address}. @@ -1453,18 +1454,11 @@ ca: el canvi. lost_password: subject: '[OpenStreetMap] Sol·licitud de reinicialització de contrasenya' - lost_password_plain: greeting: Hola, hopefully_you: Algú (possiblement vós) ha demanat reincialitzar la contrasenya del compte d'openstreetmap.org associat a aquesta adreça de correu electrònic. click_the_link: Si sou vós mateix, feu clic a l'enllaç de sota per reinicialitzar la contrasenya. - lost_password_html: - greeting: Hola, - hopefully_you: Algú (possiblement vós) ha demanat reincialitzar la contrasenya - del compte d'openstreetmap.org associat a aquesta adreça de correu electrònic. - click_the_link: Si sou vós, feu clic a l'enllaç de sota per reinicialitzar la - vostra contrasenya. note_comment_notification: anonymous: Un usuari anònim greeting: Hola, @@ -1474,25 +1468,38 @@ ca: subject_other: '[OpenStreetMap] %{commenter} ha comentat una nota que us interessa' your_note: '%{commenter} ha fet un comentari en una de les vostres notes de mapa a prop de %{place}.' + your_note_html: '%{commenter} ha deixat un comentari en una de les vostres + notes de mapa a prop de %{place}.' commented_note: '%{commenter} ha fet un comentari en una nota de mapa que havíeu comentat. Aquesta nota és a prop de %{place}.' + commented_note_html: '%{commenter} ha deixat un comentari en una nota de mapa + que havíeu comentat. Aquesta nota és a prop de %{place}.' closed: subject_own: '[OpenStreetMap] %{commenter} ha solucionat una de les vostres notes' subject_other: '[OpenStreetMap] %{commenter} ha solucionat una nota que us interessa' your_note: '%{commenter} ha resolt una de les notes de mapa a prop %{place}.' + your_note_html: '%{commenter} ha resolt una de les vostres notes de mapa a + prop de %{place}.' commented_note: '%{commenter} ha resolt una nota de mapa que havíeu comentat. Aquesta nota és a prop de %{place}.' + commented_note_html: '%{commenter} ha resolt una nota de mapa que havíeu comentat. + Aquesta nota és a prop de %{place}.' reopened: subject_own: '[OpenStreetMap] %{commenter} ha reactivat una de les vostres notes' subject_other: '[OpenStreetMap] %{commenter} ha reactivat una nota que us interessa' your_note: '%{commenter} ha reactivat una de les notes de mapa a prop de %{place}.' + your_note_html: '%{commenter} ha reactivat una de les vostres notes de mapa + a prop de %{place}.' commented_note: '%{commenter} ha reactivat una nota de mapa que havíeu comentat. La nota és a prop de %{place}.' + commented_note_html: '%{commenter} ha reactivat una nota de mapa que havíeu + comentat. La nota és a prop de %{place}.' details: Podeu trobar més detalls de la nota a %{url}. + details_html: Podeu trobar més detalls de la nota a %{url}. changeset_comment_notification: hi: Hola %{to_user}, greeting: Hola, @@ -1503,13 +1510,21 @@ ca: que us interessa' your_changeset: '%{commenter} ha fet un comentari a %{time} en un dels vostres conjunts de canvis' - commented_changeset: '%{commenter} ha fet un comentari a %{time} en un conjunt - de canvis de %{changeset_author} que esteu mirant' + your_changeset_html: '%{commenter} ha fet un comentari a %{time} en un dels + vostres conjunts de canvis' + commented_changeset: '%{commenter} ha deixat un comentari a %{time} en un + conjunt de canvis que esteu seguint de %{changeset_author}' + commented_changeset_html: '%{commenter} ha deixat un comentari a %{time} en + un conjunt de canvis que esteu seguint creat per %{changeset_author}' partial_changeset_with_comment: amb comentari '%{changeset_comment}' + partial_changeset_with_comment_html: amb el comentari '%{changeset_comment}' partial_changeset_without_comment: cap comentari details: Podeu trobar més detalls del conjunt de canvis a %{url} + details_html: Podeu trobar més detalls del conjunt de canvis a %{url}. unsubscribe: Per deixar de seguir les actualitzacions d'aquest conjunt de canvis, - visita %{url} i clica "Deixa de seguir" + visita %{url} i clica "Dona de baixa" + unsubscribe_html: Per deixar de seguir les actualitzacions d'aquest conjunt + de canvis, visiteu %{url} i cliqueu "Dona de baixa". messages: inbox: title: Safata d'entrada @@ -1584,6 +1599,24 @@ ca: as_unread: Missatge marcat com a no llegit destroy: destroyed: Missatge suprimit + shared: + markdown_help: + title_html: Analitzat amb kramdown + headings: Encapçalaments + heading: Encapçalament + subheading: Subtítol + unordered: Llista sense ordenar + ordered: Llista ordenada + first: Primer element + second: Segon element + link: Enllaç + text: Text + image: Imatge + alt: Text alternatiu + url: URL + richtext_field: + edit: Edita + preview: Previsualitza site: about: next: Següent @@ -1759,17 +1792,6 @@ ca: vostra %{user_page}. user_page_link: pàgina d'usuari anon_edits_link_text: Llegeix aquí perquè. - flash_player_required_html: Necessiteu un reproductor de Flash per a usar el - Potlatch, l'editor Flash de l'OpenStreetMap. Podeu baixar - el reproductor Flash Player des del web Adobe.com. També hi ha altres - opcions per a editar l'OpenStreetMap. - potlatch_unsaved_changes: Teniu canvis sense desar. (Per desar els canvis al - Potlatch, desseleccioneu la via o el punt actuals si esteu en mode d'edició - en viu o feu clic a "Desa" si teniu un botó "Desa".) - potlatch2_not_configured: No s'ha configurat el Potlatch 2 - mireu http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 - per a més informació - potlatch2_unsaved_changes: Teniu canvis sense desar. (Per desar els canvis al - Potlatch 2, feu clic a "Desa".) id_not_configured: iD no s'ha configurat no_iframe_support: El vostre navegador no és compatible amb iframes HTML, que són necessàries per a aquesta funcionalitat. @@ -2796,7 +2818,7 @@ ca: show: comment: Comentari subscribe: Subscriure's - unsubscribe: Donar-se de baixa + unsubscribe: Dona de baixa hide_comment: ocultar unhide_comment: mostrar notes: diff --git a/config/locales/ce.yml b/config/locales/ce.yml index 5cbf71b45..fa930d75f 100644 --- a/config/locales/ce.yml +++ b/config/locales/ce.yml @@ -150,15 +150,9 @@ ce: other: '%{count} шо хьалха' editor: default: Ӏадйитаран кеп (хӀоттина %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (браузеран тадераг) id: name: iD description: iD (браузеран тадераг) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (браузеран тадераг) remote: name: Генара лелор description: Генара лелор (JOSM я Merkaartor) @@ -349,12 +343,7 @@ ce: new: title: Де керла дӀаяздар form: - subject: 'Тема:' - body: 'Йоза:' - language: 'Мотт:' location: 'Меттиг:' - latitude: 'Шоралла:' - longitude: 'Дохалла:' use_map_link: Гайта картан тӀехь index: title: Дневникаш @@ -765,13 +754,9 @@ ce: user_mailer: signup_confirm: greeting: Маршалла! - email_confirm_plain: + email_confirm: greeting: Маршалла, - email_confirm_html: - greeting: Маршалла, - lost_password_plain: - greeting: Маршалла, - lost_password_html: + lost_password: greeting: Маршалла, note_comment_notification: greeting: Маршалла, diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 3b8d5ec52..d1867525c 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -210,18 +210,12 @@ cs: other: před %{count} lety editor: default: Výchozí (aktuálně %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (editor v prohlížeči) id: name: iD description: iD (editor v prohlížeči) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (editor v prohlížeči) remote: name: Dálkové ovládání - description: Dálkové ovládání (JOSM nebo Merkaartor) + description: Dálkové ovládání (JOSM, Potlatch, Merkaartor) auth: providers: none: Žádná @@ -268,6 +262,16 @@ cs: anonymous: anonym no_comment: (bez komentáře) part_of: Součást + part_of_relations: + one: 1 relace + few: '%{count} relace' + many: '%{count} relací' + other: '%{count} relací' + part_of_ways: + one: 1 cesta + few: '%{count} cesty' + many: '%{count} cest' + other: '%{count} cest' download_xml: Stáhnout XML view_history: Zobrazit historii view_details: Zobrazit detaily @@ -302,6 +306,11 @@ cs: title_html: 'Cesta: %{name}' history_title_html: 'Historie cesty: %{name}' nodes: Uzly + nodes_count: + one: 1 uzel + few: '%{count} uzly' + many: '%{count} uzlů' + other: '%{count} uzlů' also_part_of_html: one: patří do cesty %{related_ways} other: patří do cest %{related_ways} @@ -309,6 +318,11 @@ cs: title_html: 'Relace: %{name}' history_title_html: 'Historie relace: %{name}' members: Prvky + members_count: + one: 1 prvek + few: '%{count} prvky' + many: '%{count} prvků' + other: '%{count} prvků' relation_member: entry_role_html: '%{type} %{name} jako %{role}' type: @@ -430,13 +444,8 @@ cs: new: title: Nový záznam do deníku form: - subject: 'Předmět:' - body: 'Text:' - language: 'Jazyk:' - location: 'Místo:' - latitude: 'Zeměpisná šířka:' - longitude: 'Zeměpisná délka:' - use_map_link: použít mapu + location: Místo + use_map_link: Použít mapu index: title: Deníky uživatelů title_friends: Deníky přátel @@ -465,7 +474,8 @@ cs: body: Je nám líto, ale žádný deníkový záznam či komentář s ID %{id} neexistuje. Zkontrolujte překlepy, nebo jste možná klikli na chybný odkaz. diary_entry: - posted_by_html: Zapsal %{link_user} %{created} v jazyce %{language_link} + posted_by_html: Zapsal %{link_user} %{created} v jazyce %{language_link}. + updated_at_html: Naposledy aktualizováno %{updated} comment_link: Okomentovat tento zápis reply_link: Pošlete zprávu autorovi comment_count: @@ -1278,12 +1288,15 @@ cs: "yes": Vodní cesta admin_levels: level2: Státní hranice + level3: Hranice regionu level4: Hranice země, provincie či regionu level5: Hranice regionu level6: Hranice okresu + level7: Hranice obce level8: Hranice obce level9: Hranice vesnice level10: Hranice městské části + level11: Hranice sousedství types: cities: Velkoměsta towns: Města @@ -1447,12 +1460,21 @@ cs: hi: Ahoj, uživateli %{to_user}, header: '%{from_user} okomentoval záznam v deníku na OpenStreetMap s předmětem %{subject}:' + header_html: '%{from_user} okomentoval záznam v deníku na OpenStreetMap s předmětem + %{subject}:' footer: Můžete si také přečíst komentář na %{readurl} a můžete komentovat na %{commenturl} nebo poslat zprávu autorovi na %{replyurl} + footer_html: Můžete si také přečíst komentář na %{readurl} a můžete komentovat + na %{commenturl} nebo poslat zprávu autorovi na %{replyurl} message_notification: + subject: '[OpenStreetMap] %{message_title}' hi: Dobrý den, uživateli %{to_user}, header: '%{from_user} vám poslal(a) prostřednictvím OpenStreetMap zprávu s předmětem %{subject}:' + header_html: '%{from_user} vám poslal(a) prostřednictvím OpenStreetMap zprávu + s předmětem %{subject}:' + footer: Můžete si také přečíst zprávu na %{readurl} a můžete poslat zprávu autorovi + na %{replyurl} footer_html: Můžete si také přečíst zprávu na %{readurl} a můžete poslat zprávu autorovi na %{replyurl} friendship_notification: @@ -1460,12 +1482,23 @@ cs: subject: '[OpenStreetMap] %{user} si vás přidal jako přítele' had_added_you: '%{user} si vás na OpenStreetMap přidal(a) jako přítele.' see_their_profile: Jeho/její profil si můžete prohlédnout na %{userurl}. + see_their_profile_html: Jeho/její profil si můžete prohlédnout na %{userurl}. befriend_them: Můžete si ho/ji také přidat jako přítele na %{befriendurl}. + befriend_them_html: Můžete si ho/ji také přidat jako přítele na %{befriendurl}. + gpx_description: + description_with_tags_html: 'Vypadá to, že váš GPX soubor %{trace_name} s popisem + %{trace_description} a s těmito značkami: %{tags}' + description_with_no_tags_html: Vypadá to, že váš GPX soubor %{trace_name} s + popisem %{trace_description} a bez značek gpx_failure: + hi: Ahoj, %{to_user}, failed_to_import: 'se nepodařilo nahrát. Chybové hlášení následuje:' + more_info_html: Více informací o chybách při importu GPX a jak se jim vyhnout, + najdete na %{url}. import_failures_url: http://wiki.openstreetmap.org/wiki/GPX_Import_Failures?uselang=cs subject: '[OpenStreetMap] Neúspěšný import GPX' gpx_success: + hi: Ahoj %{to_user}, loaded_successfully: one: se úspěšně nahrál s %{trace_points} z možného 1 bodu. other: se úspěšně nahrál s %{trace_points} z možných %{possible_points} bodů. @@ -1481,13 +1514,6 @@ cs: informací. email_confirm: subject: '[OpenStreetMap] Potvrzení vaší e-mailové adresy' - email_confirm_plain: - greeting: Dobrý den, - hopefully_you: Někdo (snad vy) požádal o změnu e-mailové adresy na serveru %{server_url} - na %{new_address}. - click_the_link: Pokud jste to byli Vy, potvrďte změnu kliknutím na následující - odkaz. - email_confirm_html: greeting: Dobrý den, hopefully_you: Někdo (snad vy) požádal o změnu e-mailové adresy na serveru %{server_url} na %{new_address}. @@ -1495,18 +1521,11 @@ cs: odkaz. lost_password: subject: '[OpenStreetMap] Žádost o nové heslo' - lost_password_plain: greeting: Dobrý den, hopefully_you: Někdo (patrně vy) požádal o vygenerování nového hesla pro uživatele serveru openstreetmap.org s touto e-mailovou adresou. click_the_link: Pokud jste to byli Vy, kliknutím na níže uvedený odkaz získáte nové heslo. - lost_password_html: - greeting: Ahoj, - hopefully_you: Někdo (patrně vy) požádal o vygenerování nového hesla pro uživatele - serveru openstreetmap.org s touto e-mailovou adresou. - click_the_link: Pokud jste to byli Vy, kliknutím na níže uvedený odkaz získáte - nové heslo. note_comment_notification: anonymous: Anonymní uživatel greeting: Ahoj, @@ -1516,24 +1535,37 @@ cs: která vás zajímá' your_note: '%{commenter} okomentoval jednu z vašich poznámek k mapě nedaleko %{place}.' + your_note_html: '%{commenter} okomentoval jednu z vašich poznámek k mapě nedaleko + %{place}.' commented_note: '%{commenter} okomentoval poznámku k mapě, kterou jste také komentovali. Poznámka je umístěna poblíž %{place}.' + commented_note_html: '%{commenter} okomentoval poznámku k mapě, kterou jste + také komentovali. Poznámka je umístěna poblíž %{place}.' closed: subject_own: '[OpenStreetMap] %{commenter} vyřešil jednu z vašich poznámek' subject_other: '[OpenStreetMap] %{commenter} vyřešil jednu z poznámek, která vás zajímá' your_note: '%{commenter} vyřešil jednu z vašich poznámek k mapě nedaleko %{place}.' + your_note_html: '%{commenter} vyřešil jednu z vašich poznámek k mapě nedaleko + %{place}.' commented_note: '%{commenter} vyřešil poznámku k mapě, kterou jste komentovali. Poznámka je umístěna poblíž %{place}.' + commented_note_html: '%{commenter} vyřešil poznámku k mapě, kterou jste komentovali. + Poznámka je umístěna poblíž %{place}.' reopened: subject_own: '[OpenStreetMap] %{commenter} reaktivoval jednu z vašich poznámek' subject_other: '[OpenStreetMap] %{commenter} reaktivoval jednu z poznámek, která vás zajímá' your_note: '%{commenter} reaktivoval jednu z vašich poznámek k mapě nedaleko %{place}.' + your_note_html: '%{commenter} reaktivoval jednu z vašich poznámek k mapě nedaleko + %{place}.' commented_note: '%{commenter} reaktivoval poznámku k mapě, kterou jste komentovali. Poznámka je umístěna poblíž %{place}.' + commented_note_html: '%{commenter} reaktivoval poznámku k mapě, kterou jste + komentovali. Poznámka je umístěna poblíž %{place}.' details: Podrobnosti k poznámce můžete najít na %{url}. + details_html: Podrobnosti k poznámce můžete najít na %{url}. changeset_comment_notification: hi: Dobrý den, uživateli %{to_user}, greeting: Dobrý den, @@ -1544,13 +1576,21 @@ cs: která vás zajímá' your_changeset: '%{commenter} zanechal %{time} komentář na jedné z vašich sad změn.' + your_changeset_html: '%{commenter} zanechal %{time} komentář na jedné z vašich + sad změn.' commented_changeset: '%{commenter} zanechal %{time} komentář na Vámi sledované sadě změn, kterou vytvořil %{changeset_author}.' + commented_changeset_html: '%{commenter} zanechal %{time} komentář na Vámi + sledované sadě změn, kterou vytvořil %{changeset_author}.' partial_changeset_with_comment: s komentářem „%{changeset_comment}“ + partial_changeset_with_comment_html: s komentářem „%{changeset_comment}“ partial_changeset_without_comment: bez komentáře details: Více informací o této sadě změn lze nalézt na %{url}. + details_html: Více informací o této sadě změn lze nalézt na %{url}. unsubscribe: Pro odhlášení z aktualizací této sady změn jděte na %{url} a klikněte na „Zrušit odebírání“. + unsubscribe_html: Pro odhlášení z aktualizací této sady změn jděte na %{url} + a klikněte na „Zrušit odebírání“. messages: inbox: title: Doručená pošta @@ -1629,6 +1669,24 @@ cs: as_unread: Zpráva označena jako nepřečtená destroy: destroyed: Zpráva smazána + shared: + markdown_help: + title_html: Zpracovává se kramdownem + headings: Nadpisy + heading: Nadpis + subheading: Podnadpis + unordered: Neseřazený seznam + ordered: Číslovaný seznam + first: První položka + second: Druhá položka + link: Odkaz + text: Text + image: Obrázek + alt: Alternativní text + url: URL + richtext_field: + edit: Upravit + preview: Náhled site: about: next: Další @@ -1792,17 +1850,6 @@ cs: editace můžete zveřejnit na %{user_page}. user_page_link: uživatelské stránce anon_edits_link_text: Proč to tak je? - flash_player_required_html: Pokud chcete používat Potlatch, flashový editor - OpenStreetMap, potřebujete přehrávač Flashe. Můžete si stáhnout - Flash Player z Adobe.com. Pro editaci OpenStreetMap existuje mnoho - dalších možností. - potlatch_unsaved_changes: Máte neuložené změny. (V Potlatchi odznačte aktuální - cestu nebo bod, pokud editujete v živém režimu, nebo klikněte na tlačítko - uložit, pokud tam je.) - potlatch2_not_configured: Potlatch 2 není nakonfigurován – podrobnější informace - najdete na https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 - potlatch2_unsaved_changes: Máte neuložené změny. (V Potlatch 2 se ukládá kliknutím - na tlačítko.) id_not_configured: iD nebyl nakonfigurován no_iframe_support: Váš prohlížeč nepodporuje vložené HTML rámy (iframes), které jsou pro tuto funkci nezbytné. @@ -1911,6 +1958,15 @@ cs: url: https://wiki.openstreetmap.org/wiki/Cs:Main_Page?uselang=cs title: OpenStreetMap Wiki description: Podrobnou dokumentaci OpenStreetMap najdete na wiki. + potlatch: + removed: Jako preferovaný editor pro OpenStreetMap máte nastaven Potlatch. Protože + byl ale Adobe Flash Player ukončen, Potlatch již pro použití ve webovém prohlížeči + není dostupný. + desktop_html: Potlatch můžete stále používat stažením + desktopové aplikace pro Mac a Windows. + id_html: Nebo si můžete jako preferovaný editor nastavit iD, které běží ve webovém + prohlížeči tak, jak dříve fungoval Potlatch. Nastavení + můžete změnit zde. sidebar: search_results: Výsledky hledání close: Zavřít diff --git a/config/locales/cy.yml b/config/locales/cy.yml index 707f49205..6a9802971 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -126,15 +126,9 @@ cy: other: llai nag %{count} eiliad yn ôl editor: default: (currently %{name}) diofyn - potlatch: - name: Potlatch 1 - description: Potlatch 1 (golygygu gyda'r porwr) id: name: iD description: iD (golygydd y porwr) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (golygu gyda'r porwr) remote: name: Rheolaeth o bell description: Pellreolwr (JOSM neu Merkaartor) @@ -311,12 +305,7 @@ cy: new: title: Cofnod Dyddiadur Newydd form: - subject: 'Pwnc:' - body: 'Corff:' - language: 'Iaith:' location: 'Lleoliad:' - latitude: Hydred - longitude: Lledred use_map_link: defnyddiwch y map index: title: Dyddiaduron defnyddwyr @@ -1042,7 +1031,7 @@ cy: signup_confirm: greeting: Pa hwyl! created: Mae rhywun (chi gobeithio!) newydd greu cyfrif yn %{site_url}. - email_confirm_plain: + email_confirm: greeting: Pa hwyl, note_comment_notification: anonymous: Defnyddiwr anhysbys diff --git a/config/locales/da.yml b/config/locales/da.yml index f985cf6bc..ef5bbcb00 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -199,15 +199,9 @@ da: other: '%{count} år siden' editor: default: Foretrukket (i øjeblikket %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (redigér i browseren) id: name: iD description: iD (redigér i browseren) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (redigér i browseren) remote: name: Fjernbetjening description: Fjernbetjening (JOSM eller Merkaartor) @@ -427,13 +421,8 @@ da: new: title: Nyt blogindlæg form: - subject: 'Emne:' - body: 'Indhold:' - language: 'Sprog:' - location: 'Position:' - latitude: 'Breddegrad:' - longitude: 'Længdegrad:' - use_map_link: brug kort + location: Position + use_map_link: Brug kort index: title: Brugerblogs title_friends: Venners blogs @@ -1476,13 +1465,6 @@ da: så du kan komme godt i gang. email_confirm: subject: '[OpenStreetMap] Bekræft din e-mailadresse' - email_confirm_plain: - greeting: Hej, - hopefully_you: En eller anden (forhåbentlig dig) ønsker at ændre sin e-mailadresse - på %{server_url} til %{new_address}. - click_the_link: Hvis det er dig, skal du klikke på linket nedenfor for at bekræfte - ændringen. - email_confirm_html: greeting: Hej, hopefully_you: En eller anden (forhåbentlig dig) ønsker at ændre sin e-mailadresse på %{server_url} til %{new_address}. @@ -1490,18 +1472,11 @@ da: ændringen. lost_password: subject: '[OpenStreetMap] Nulstilling af adgangskode' - lost_password_plain: greeting: Hej, hopefully_you: En eller anden (forhåbentlig dig) har bedt om at få adgangskoden nulstillet på denne e-mailadresses openstreetmap.org-konto. click_the_link: Hvis dette er dig, så klik på linket nedenfor for at nulstille din adgangskode. - lost_password_html: - greeting: Hej, - hopefully_you: En eller anden (forhåbentlig dig) har bedt om at få adgangskoden - nulstillet på denne emailadresses openstreetmap.org-konto. - click_the_link: Hvis dette er dig, så klik på linket nedenfor for at nulstille - din adgangskode. note_comment_notification: anonymous: En anonym bruger greeting: Hej, @@ -1620,6 +1595,12 @@ da: as_unread: Besked markeret som ulæst destroy: destroyed: Besked slettet + shared: + markdown_help: + text: Tekst + image: Billede + richtext_field: + edit: Rediger site: about: next: Næste @@ -1805,18 +1786,6 @@ da: gør dette. Du kan gøre dine ændringer offentlige fra din %{user_page}. user_page_link: brugerside anon_edits_link_text: Find ud af hvorfor. - flash_player_required_html: Du har brug for en Flashafspiller for at bruge Potlatch, - OpenStreetMap Flash-redigeringsprogrammet. Du kan hent - Flash Player fra Adobe.com. Flere - andre indstillinger er også tilgængelige til redigering af OpenStreetMap. - potlatch_unsaved_changes: Du har ugemte ændringer (for at gemme i Potlatch skal - du afmarkere den nuværende vej eller nuværende punkt hvis du retter i live-tilstand, - eller klikke på gem-knappen hvis du har en). - potlatch2_not_configured: Potlatch 2 er ikke blevet konfigureret - se venligst - https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 for yderligere - information - potlatch2_unsaved_changes: Du har ugemte ændringer (for at gemme i Potlatch - 2 skal du trykke på gem-knappen). id_not_configured: iD er ikke blevet konfigureret no_iframe_support: Din browser understøtter ikke HTML-iframes, hvilket er nødvendigt for denne funktion. diff --git a/config/locales/de.yml b/config/locales/de.yml index d734ab66f..0053c557a 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -3,6 +3,7 @@ # Export driver: phpyaml # Author: Abijeet Patro # Author: Al +# Author: Alefar # Author: Als-Holder # Author: Amilopowers # Author: Apmon @@ -24,6 +25,7 @@ # Author: DraconicDark # Author: Drolbr # Author: Elliot +# Author: Farad # Author: Ferdinand0101 # Author: Fujnky # Author: Geitost @@ -59,6 +61,7 @@ # Author: Mormegil # Author: P24 # Author: Pill +# Author: Pittigrilli # Author: Predatorix # Author: Purodha # Author: Raymond @@ -77,6 +80,7 @@ # Author: Umherirrender # Author: Unkn0wnCat # Author: Woodpeck +# Author: Zauberzunge2000 --- de: time: @@ -158,7 +162,7 @@ de: allow_write_prefs: Ihre Benutzereinstellungen verändern. allow_write_diary: Blogeinträge und Kommentare schreiben und Freunde finden allow_write_api: Karte bearbeiten - allow_read_gpx: Zugriff auf ihre privaten GPS-Tracks. + allow_read_gpx: Zugriff auf ihre privaten GPS-Tracks allow_write_gpx: GPS-Track hochladen allow_write_notes: Notizen bearbeiten diary_comment: @@ -246,15 +250,9 @@ de: with_name_html: '%{name} (%{id})' editor: default: Voreinstellung (derzeit %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (im Browser eingebetteter Editor) id: name: iD description: iD (im Browser eingebetteter Editor) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (im Browser eingebetteter Editor) remote: name: Fernsteuerung description: externem Editor (JOSM oder Merkaartor) @@ -474,12 +472,7 @@ de: new: title: Neuer Blogeintrag form: - subject: 'Betreff:' - body: 'Text:' - language: 'Sprache:' - location: 'Ort:' - latitude: 'Breitengrad:' - longitude: 'Längengrad:' + location: Ort use_map_link: Karte benutzen index: title: Benutzer-Blogs @@ -511,6 +504,7 @@ de: Link gefolgt. diary_entry: posted_by_html: Verfasst von %{link_user} am %{created} in %{language_link} + updated_at_html: Letzte Aktualisierung am %{updated} comment_link: Kommentar zu diesem Eintrag reply_link: Eine Nachricht an den Autor senden comment_count: @@ -1183,7 +1177,7 @@ de: clothes: Bekleidungsgeschäft coffee: Kaffeegeschäft computer: Computergeschäft - confectionery: Konditorei + confectionery: Süßwarenladen convenience: Nachbarschaftsladen copyshop: Copyshop cosmetics: Parfümerie @@ -1321,12 +1315,15 @@ de: "yes": Wasserstraße admin_levels: level2: Staatsgrenze + level3: Regionsgrenze level4: Landesgrenze level5: Regionsgrenze level6: Kreis-/Bezirksgrenze + level7: Gemeindegrenze level8: Gemeinde-/Stadtgrenze level9: Stadtteilgrenze level10: Nachbarschaftsgrenze + level11: Nachbarschaftsgrenze types: cities: Großstädte towns: Städte @@ -1498,13 +1495,21 @@ de: hi: Hallo %{to_user}, header: '%{from_user} hat zu dem OpenStreetMap-Blogeintrag mit dem Thema %{subject} kommentiert:' + header_html: '%{from_user} hat zu dem OpenStreetMap-Blogeintrag mit dem Thema + %{subject} kommentiert:' footer: Hier gehts zum Kommentar %{readurl}, du kannst ihn kommentieren %{commenturl} oder dem Autor unter %{replyurl} antworten. + footer_html: Hier gehts zum Kommentar %{readurl}, Du kannst ihn kommentieren + %{commenturl} oder dem Autor unter %{replyurl} eine Nachricht senden. message_notification: - subject_header: '[OpenStreetMap] %{subject}' + subject: '[OpenStreetMap] %{message_title}' hi: Hallo %{to_user}, header: '%{from_user} hat dir eine Nachricht über OpenStreetMap mit dem Betreff %{subject} gesendet:' + header_html: '%{from_user} hat dir eine Nachricht über OpenStreetMap mit dem + Betreff %{subject} gesendet:' + footer: Du kannst auch die Nachricht unter %{readurl} lesen und dem Autor unter + %{replyurl} antworten footer_html: Du kannst auch die Nachricht unter %{readurl} lesen und dem Autor unter %{replyurl} antworten friendship_notification: @@ -1512,12 +1517,23 @@ de: subject: '[OpenStreetMap] %{user} hat dich als Freund hinzugefügt' had_added_you: '%{user} hat dich als Freund hinzugefügt.' see_their_profile: Du kannst sein/ihr Profil unter %{userurl} ansehen. + see_their_profile_html: Du kannst sein/ihr Profil unter %{userurl} ansehen. befriend_them: Du kannst sie/ihn unter %{befriendurl} ebenfalls als Freund hinzufügen. + befriend_them_html: Du kannst sie/ihn unter %{befriendurl} auch als Freund hinzufügen. + gpx_description: + description_with_tags_html: 'Es scheint, dass deine GPX-Datei %{trace_name} + mit der Beschreibung %{trace_description} und den folgenden Tags: %{tags}' + description_with_no_tags_html: Es scheint, dass deine GPX-Datei %{trace_name} + mit der Beschreibung %{trace_description} und ohne Tags gpx_failure: + hi: Hallo %{to_user}, failed_to_import: 'konnte nicht importiert werden, die Fehlermeldung:' + more_info_html: Weitere Informationen über Fehler bei GPX-Importen und wie sie + vermieden werden können finden sich in %{url} import_failures_url: https://wiki.openstreetmap.org/wiki/DE:GPX subject: '[OpenStreetMap] GPX-Import Fehler' gpx_success: + hi: Hallo %{to_user}, loaded_successfully: one: mit %{trace_points} von 1 möglichem Punkt erfolgreich geladen. other: mit %{trace_points} von %{possible_points} möglichen Punkten erfolgreich @@ -1534,32 +1550,18 @@ de: Informationen, um anzufangen. email_confirm: subject: '[OpenStreetMap] Deine E-Mail-Adresse bestätigen' - email_confirm_plain: greeting: Hallo, hopefully_you: Jemand (hoffentlich du) will seine E-Mail-Adresse auf %{server_url} zu „%{new_address}“ ändern. click_the_link: Wenn du das bist, bestätige bitte deine E-Mail-Adresse mit dem Link unten. - email_confirm_html: - greeting: Hallo, - hopefully_you: Jemand (hoffentlich du) möchte seine E-Mail-Adresse bei %{server_url} - zu %{new_address} ändern. - click_the_link: Wenn du das bist, bestätige bitte deine E-Mail-Adresse mit dem - Link unten lost_password: subject: '[OpenStreetMap] Anfrage zum Passwort zurücksetzen' - lost_password_plain: greeting: Hallo, hopefully_you: Jemand (wahrscheinlich du) hat eine Zurücksetzung des Passworts für das openstreetmap.org-Konto an diese E-Mail-Adresse angefordert. click_the_link: Wenn du das bist, klicke bitte auf den Link unten, um dein Passwort zurückzusetzen. - lost_password_html: - greeting: Hallo, - hopefully_you: Jemand (hoffentlich du) hat darum gebeten sein Passwort für das - OpenStreetMap-Benutzerkonto mit dieser E-Mail-Adresse zurückzusetzen. - click_the_link: Wenn du das bist, klicke bitte auf den Link unten, um dein Passwort - zurückzusetzen. note_comment_notification: anonymous: Ein anonymer Benutzer greeting: Hallo, @@ -1570,8 +1572,13 @@ de: an dem du interessiert bist' your_note: '%{commenter} hat einen von dir gemeldeten Hinweis in der Nähe von %{place} kommentiert.' + your_note_html: '%{commenter} hat einen von dir gemeldeten Hinweis in der + Nähe von %{place} kommentiert.' commented_note: '%{commenter} hat zu einem Hinweis, den du kommentiert hattest, einen weiteren Kommentar hinterlegt. Der Hinweis ist in der Nähe von %{place}.' + commented_note_html: '%{commenter} hat zu einem Hinweis, den du kommentiert + hattest, einen weiteren Kommentar hinterlegt. Der Hinweis ist in der Nähe + von %{place}.' closed: subject_own: '[OpenStreetMap] %{commenter} hat ein von dir gemeldetes Problem gelöst' @@ -1579,17 +1586,26 @@ de: an dem du interessiert bist' your_note: '%{commenter} hat ein von dir gemeldetes Problem in der Nähe von %{place} gelöst.' + your_note_html: '%{commenter} hat ein von dir gemeldetes Problem in der Nähe + von %{place} gelöst.' commented_note: '%{commenter} hat Problem gelöst, das du kommentiert hattest. Der Hinweis war in der Nähe von %{place}.' + commented_note_html: '%{commenter} hat ein Problem/Thema gelöst, zu dem Du + kommentiert hattest. Der Hinweis war in der Nähe von %{place}.' reopened: subject_own: '[OpenStreetMap] %{commenter} hat einen Hinweis von dir reaktiviert' subject_other: '[OpenStreetMap] %{commenter} hat einen Hinweis, an dem du interessiert bist, reaktiviert' your_note: '%{commenter} hat einen Hinweis von dir in der Nähe von %{place} reaktiviert.' + your_note_html: '%{commenter} hat einen Hinweis von dir in der Nähe von %{place} + reaktiviert.' commented_note: '%{commenter} hat einen Hinweis in der Nähe von %{place}, den du kommentiert hattest, reaktivert.' + commented_note_html: '%{commenter} hat einen Hinweis in der Nähe von %{place}, + den du kommentiert hattest, reaktivert.' details: Weitere Details über den Hinweis findest du unter %{url}. + details_html: Weitere Details über den Hinweis findest du unter %{url}. changeset_comment_notification: hi: Hallo %{to_user}, greeting: Hallo, @@ -1600,14 +1616,22 @@ de: an dem du interessiert bist' your_changeset: '%{commenter} hinterließ einen Diskussionsbeitrag um %{time} zu einem deiner Änderungssätze' + your_changeset_html: '%{commenter} hat um %{time} zu einem deiner Änderungssätze + einen Diskussionsbeitrag hinterlassen' commented_changeset: '%{commenter} hinterließ einen Diskussionbeitrag um %{time} zu einem Kartenänderungssatz, den du beobachtest, erstellt von %{changeset_author}' + commented_changeset_html: '%{commenter} hat um %{time} einen Diskussionsbeitrag + zu einem von dir beobachteten Änderungssatz von %{changeset_author} hinterlassen' partial_changeset_with_comment: mit der Bemerkung „%{changeset_comment}“ + partial_changeset_with_comment_html: mit der Bemerkung „%{changeset_comment}“ partial_changeset_without_comment: ohne Kommentar details: Weitere Details über den Änderungssatz können gefunden werden unter %{url}. + details_html: Weitere Details über den Änderungssatz findest Du unter %{url}. unsubscribe: Um die Aktualisierungen an diesem Änderungssatz abzubestellen, besuche %{url} und klicke auf „Abmelden“. + unsubscribe_html: Um Aktualisierungen an diesem Änderungssatz abzubestellen, + besuche %{url} und klicke auf „Abmelden“. messages: inbox: title: Posteingang @@ -1683,6 +1707,24 @@ de: as_unread: Nachricht als ungelesen markiert destroy: destroyed: Nachricht gelöscht + shared: + markdown_help: + title_html: Geparst mit kramdown + headings: Überschriften + heading: Überschrift + subheading: Zwischenüberschrift + unordered: Unsortierte Liste + ordered: Sortiere Liste + first: Erstes Element + second: Zweites Element + link: Link + text: Text + image: Bild + alt: Alternativer Text + url: URL + richtext_field: + edit: Bearbeiten + preview: Vorschau site: about: next: Nächste @@ -1875,18 +1917,6 @@ de: %{user_page} tun. user_page_link: Einstellungsseite anon_edits_link_text: Hier findest du mehr Infos dazu. - flash_player_required_html: Du benötigst den Flash Player um Potlatch, den OpenStreetMap-Flash-Editor, - zu benutzen. Lade den Flash Player - von Adobe.com herunter. Einige - andere Möglichkeiten, um OpenStreetMap zu editieren, sind hier beschrieben. - potlatch_unsaved_changes: Du hast deine Arbeit noch nicht gespeichert. (Um sie - in Potlach zu speichern, klicke auf eine leere Fläche bzw. deselektiere die - Linie oder den Knoten, wenn du im Live-Modus editierst oder klicke auf Speichern, - wenn ein Speicherbutton vorhanden ist.) - potlatch2_not_configured: Potlatch 2 wurde nicht konfiguriert - Bitte besuche - https://wiki.openstreetmap.org/wiki/The_Rails_Port - potlatch2_unsaved_changes: Es gibt ungesicherte Änderungen. (Du solltest in - Potlatch 2 „speichern“ klicken.) id_not_configured: iD wurde nicht konfiguriert no_iframe_support: Der Browser unterstützt keine HTML-Inlineframes (iframes), die für diese Funktion notwendig sind. diff --git a/config/locales/diq.yml b/config/locales/diq.yml index df567ee34..b21751d53 100644 --- a/config/locales/diq.yml +++ b/config/locales/diq.yml @@ -90,6 +90,10 @@ diq: support_url: Gırey Destegi allow_read_prefs: Tercihanê karberi bıwanê allow_write_prefs: Tercihanê karberanê inan bıvurne + allow_write_api: Xeritay bıvurne + allow_read_gpx: Rêça GPSanê xısusiyan bıwane + allow_write_gpx: Şopanê GPSi bar kerê + allow_write_notes: Notan bıvurne diary_comment: body: Metın diary_entry: @@ -110,6 +114,7 @@ diq: longitude: Derganiye public: Pêroyi description: Şınasnayış + gpx_file: Dosyay GPXi bar kerê visibility: Asayış tagstring: Etiketi message: @@ -117,6 +122,8 @@ diq: title: Mewzu body: Metın recipient: Grotker + report: + category: Qandê rapor jew sebeb weçinê user: email: E-poste active: Aktiv @@ -124,17 +131,12 @@ diq: description: Şınasnayış languages: Zıwani pass_crypt: Parola + pass_crypt_confirmation: Parola tesdiq ke editor: default: Hesabiyaye (%{name}yo nıkayên) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (browser vurnayoğ) id: name: iD description: iD (browser vurnayoğ) - potlatch2: - name: Potlatch 1 - description: Potlatch 2 (browser vurnayoğ) remote: name: Duri da qontrol description: Duri ra Qonrtol (JOSM yana Merkaartor) @@ -156,6 +158,7 @@ diq: commented_at_by_html: Terefê %{user} ra %{when} de rocaneyayo entry: comment: Mışewre + full: Note pêro browse: created: Vıraziya closed: Kerd kip @@ -171,6 +174,12 @@ diq: anonymous: anonim no_comment: (be vatış) part_of: Letey + part_of_relations: + one: '1 eleqe ' + other: '%{count} eleqey' + part_of_ways: + one: 1 ray + other: '%{count} rayi' download_xml: XML ron view_history: Verêni bıvêne view_details: Teferuatan Bıvêne @@ -189,6 +198,7 @@ diq: osmchangexml: OsmVurnayışê XML feed: title: 'Koma vurnayışi: %{id}' + title_comment: '%{id} - %{comment} vurniyayışi' join_discussion: Dekewtena vatenayışi rê qeyd bê discussion: Werênayış node: @@ -215,6 +225,7 @@ diq: entry_html: Elaqe %{relation_name} entry_role_html: Eleqe %{relation_name} (%{relation_role} deye) not_found: + title: Nêvineya sorry: 'Qısur mewni, #%{id} numreya %{type} nêvine yê.' type: node: qedyin @@ -245,6 +256,8 @@ diq: title: 'Not: %{id}' new_note: Nota Newi description: Şınasnayış + hidden_by_html: '%{user} %{when} bınımnê' + report: Nê noti rapor ke query: title: Xısusiyetan bıasne introduction: Xısusiyetanê nezdiyan vinayışi rê xeriter sero bıploğnê @@ -272,20 +285,24 @@ diq: title_nearby: Nezdıra vurriyayışê setê karberi load_more: Dehana vêşi barkerê diary_entries: + new: + title: Roceko newe definayış form: - subject: 'Mewzu:' - body: 'Metın:' - language: 'Zıwan:' - location: 'Lokasyon:' - latitude: 'Verıniye:' - longitude: 'Derganiye:' - use_map_link: xerita bıgurene + location: Lokasyon + use_map_link: Xerita bıgurene index: + title: Rocekê Karberi + title_friends: Rocekê embazan + title_nearby: Nezdı ra rocekê karberan user_title: '%{user} rocek' + in_language_title: '%{language} dekewtekê roci' + new: Roceko newe definayış my_diary: Rocekê mı edit: marker_text: Lokasyonê rocekê cıkewtışi show: + title: Rocekê %{user}'i | %{title} + user_title: Rocekê %{user}'i leave_a_comment: Yew mışewre bınuse login_to_leave_a_comment_html: Seba mışewreyi rê %{login_link} login: Cıkewtış @@ -328,15 +345,23 @@ diq: aerialway: cable_car: Kabloy ereber gondola: Telesiyej + pylon: Pylon station: İstasyona teleferiki + "yes": Hewaray aeroway: aerodrome: Hewaherun + airstrip: Pistê perayışi apron: Apron gate: Keyber + hangar: Hangar helipad: Hruna Helikopteri + holding_position: Pozisyonê tesbiti + parking_position: Pozisyonê parki runway: Pista teyera + taxilane: Taxilane taxiway: Raya Texsiyan terminal: Terminal + windsock: Loğavay amenity: animal_shelter: Kozıkê heywanan arts_centre: Merkeze Zagoni @@ -391,6 +416,8 @@ diq: nursing_home: Rehatxane parking: Otopark parking_entrance: Keyberê par kerdışi + parking_space: Cay parki + payment_terminal: Terminalê Dayışi pharmacy: Eczaxane place_of_worship: Bawerxane police: Pulis @@ -398,6 +425,7 @@ diq: post_office: Postexane prison: Hepısxane pub: Biraxane + public_bath: Hemam public_building: Binaya Şaran recycling: Heruna peyd amayışi restaurant: Restaurant @@ -419,18 +447,29 @@ diq: village_hall: Wedaya Dewe waste_basket: Tenkey Sıloy waste_disposal: Cay sıloy + "yes": Rehatey boundary: administrative: Sinorê İdari census: Sinora amora nıfusi national_park: Perka Milli protected_area: Star biyaye erd + "yes": Sinor bridge: aqueduct: Kemerê awer + boardwalk: İskela suspension: Pırdo layın swing: Pırde Asnawi viaduct: Viyaduk "yes": Pırd building: + apartment: Apartman + apartments: Apartmani + barn: Axur + bungalow: Bungalow + cabin: Kabin + chapel: Şapel + church: Kılise + civic: İmaret "yes": Bina craft: brewery: Fabriqay bira @@ -741,13 +780,9 @@ diq: hi: Merheba %{to_user}, message_notification: hi: Merheba %{to_user}, - email_confirm_plain: + email_confirm: greeting: Merheba, - email_confirm_html: - greeting: Merheba, - lost_password_plain: - greeting: Merheba, - lost_password_html: + lost_password: greeting: Merheba, note_comment_notification: greeting: Merheba, @@ -778,7 +813,7 @@ diq: show: title: Mesaci bıwane subject: Mewzu - date: Dem + date: Tarix reply_button: Cewab bıde destroy_button: Bestere back: Peyser diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml index 375193708..980cd2fdc 100644 --- a/config/locales/dsb.yml +++ b/config/locales/dsb.yml @@ -108,15 +108,9 @@ dsb: tagstring: pśez komu wótźělony editor: default: Standard (tuchylu %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (editor za wobźěłowanje we wobglědowaku) id: name: iD description: iD (we wobglědowaku zasajźony editor) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (editor za wobźěłowanje we wobglědowaku) remote: name: Zdalokawóźenje description: Zdalokawóźenje (JOSM abo Merkaartor) @@ -290,12 +284,7 @@ dsb: new: title: Nowy zapisk dnjownika form: - subject: 'Temowe nadpismo:' - body: 'Tekst:' - language: 'Rěc:' location: 'Městno:' - latitude: 'Šyrina:' - longitude: 'Dlinina:' use_map_link: kórtu wužywaś index: title: Dnjowniki wužywarjow @@ -921,31 +910,18 @@ dsb: za prědne kšacei daś. email_confirm: subject: '[OpenStreetMap] Twóju e-mailowu adresu wobkšuśiś' - email_confirm_plain: greeting: Witaj, hopefully_you: Něchten (naźejucy ty) co swóju e-mailowu adresu pla %{server_url} do %{new_address} změniś. click_the_link: Jolic ty to sy, klikni pšosym dołojce na wótkaz, aby wobkšuśił změnu. - email_confirm_html: - greeting: Witaj, - hopefully_you: Něchten (naźejucy ty) co swóju e-mailowu adresu pla %{server_url} - do %{new_address} změniś. - click_the_link: Jolic ty to sy, klikni pšosym dołojce na wótkaz, aby změnu wobkšuśił. lost_password: subject: '[OpenStreetMap] Napšašowanje wó slědkstajenju gronidła' - lost_password_plain: greeting: Witaj, hopefully_you: Něchten (snaź ty) jo pominał gronidło za konto OpenStreetMap z toś teju e-majloweju adresu slědk stajiś. click_the_link: Jolic ty to sy, klikni pšosym dołojce na wótkaz, aby swójo gronidło slědk stajił. - lost_password_html: - greeting: Witaj, - hopefully_you: Něchten (snaź ty) jo pominał gronidło za konto OpenStreetMap - z toś teju e-majloweju adresu slědk stajiś. - click_the_link: Jolic ty to sy, klikni pšosym dołojce na wótkaz, aby gronidło - slědk stajił. note_comment_notification: anonymous: Anonymny wužywaŕ greeting: Witaj, @@ -1193,17 +1169,6 @@ dsb: rowno. Móžoš swóje změny na swójom %{user_page} ako zjawne markěrowaś. user_page_link: wužywarskem boku anon_edits_link_text: Wuslěź, cogodla tomu tak jo. - flash_player_required_html: Trjebaš wótegrajadło Flash, aby wužywał Potlatch, - editor Flash OpenStreetMap. Móžoš wótegrajadło - Flash z Adobe.com ześěgnuś. Někotare - druge móžnosći stoje teke za wobźěłowanje OpenStreetMap k dispoziciji. - potlatch_unsaved_changes: Maš njeskłaźone změny. (Aby składował w Potlatch, - ty by dejał aktualny puś abo dypk wótwóliś, jolic wobźěłujoš w livemodusu, - abo klikni na Składowaś, jolic maš tłocašk Składowaś.) - potlatch2_not_configured: Potlach 2 njejo se konfigurěrował - pšosym glědaj - http://wiki.openstreetmap.org/wiki/The_Rails_Port - potlatch2_unsaved_changes: Sy njeskładowane změny. (Aby je w Potlatch 2 składował, - klikni na "Składowaś".) id_not_configured: iD njejo se konfigurěrował no_iframe_support: Twój wobglědowak njepódpěrujo HTML-elementy iframe, kótarež su trěbne za toś tu funkciju. diff --git a/config/locales/el.yml b/config/locales/el.yml index 90f9d687c..a2df3263f 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -17,6 +17,7 @@ # Author: Kongr43gpen # Author: Logictheo # Author: Macofe +# Author: NikosLikomitros # Author: Nikosgranturismogt # Author: Norhorn # Author: Omnipaedista @@ -193,15 +194,9 @@ el: with_version: '%{id}, v%{version}' editor: default: Προεπιλογή (τώρα είναι %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (επεξεργαστής εντός του περιηγητή) id: name: iD description: iD (επεξεργαστής εντός του περιηγητή) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (επεξεργαστής εντός του περιηγητή) remote: name: Απομακρυσμένος έλεγχος description: Απομακρυσμένος έλεγχος (JOSM ή Merkaartor) @@ -409,12 +404,7 @@ el: new: title: Νέα καταχώρηση ημερολογίου form: - subject: 'Θέμα:' - body: 'Κύριο μέρος:' - language: 'Γλώσσα:' location: 'Τοποθεσία:' - latitude: 'Γεωγραφικό πλάτος:' - longitude: 'Γεωγραφικό μήκος:' use_map_link: χρήση του χάρτη index: title: Ημερολόγια χρηστών @@ -445,7 +435,8 @@ el: %{id}. Είναι πιθανό να υπάρχουν ορθογραφικά λάθη ή να είναι λάθος ο σύνδεσμος μέσω του οποίου φτάσατε σε αυτήν την σελίδα. diary_entry: - posted_by_html: Δημοσιεύτηκε από τον %{link_user} στις %{created} στα %{language_link} + posted_by_html: Δημοσιεύτηκε από τον %{link_user} στις %{created} στα %{language_link}. + updated_at_html: Τελευταία ενημέρωση στις %{updated}. comment_link: Σχολιάστε την καταχώρηση reply_link: Αποστολή μηνύματος στον συγγραφέα comment_count: @@ -1271,9 +1262,11 @@ el: see_their_profile: Μπορείτε να δείτε το προφίλ του στο %{userurl}. befriend_them: Μπορείτε επίσης να τους προσθέσετε ως φίλους στο %{befriendurl}. gpx_failure: + hi: Γεια σας %{to_user}, failed_to_import: 'Απέτυχε η εισαγωγή. Το σφάλμα είναι:' subject: '[OpenStreetMap] Η εισαγωγή GPX απέτυχε' gpx_success: + hi: Γεια σας %{to_user}, loaded_successfully: one: φόρτωσε επιτυχώς με %{trace_points} από 1 πιθανό σημείο. other: φόρτωσε επιτυχώς με %{trace_points} από πιθανά %{possible_points} σημεία. @@ -1290,13 +1283,6 @@ el: email_confirm: subject: '[OpenStreetMap] Επιβεβαιώστε τη διεύθυνση ηλεκτρονικού ταχυδρομείου σας' - email_confirm_plain: - greeting: Γεια, - hopefully_you: Κάποιος (ελπίζουμε εσείς) θέλει να αλλάξει την διεύθυνση ηλεκτρονικού - ταχυδρομείου στο %{server_url} σε %{new_address}. - click_the_link: Εάν είστε εσείς, παρακαλούμε πατήστε τον σύνδεσμο παρακάτω για - να επιβεβαιωθεί η αλλαγή. - email_confirm_html: greeting: Γεια, hopefully_you: Κάποιος (ελπίζουμε εσείς) θέλει να αλλάξει την διεύθυνση ηλεκτρονικού ταχυδρομείου στο %{server_url} σε %{new_address}. @@ -1304,19 +1290,11 @@ el: να επιβεβαιωθεί η αλλαγή. lost_password: subject: '[OpenStreetMap] Αίτηση επαναφοράς κωδικού' - lost_password_plain: greeting: Γεια, hopefully_you: Κάποιος (πιθανότατα εσείς) έχει ζητήσει επαναφορά του κωδικού πρόσβασης του λογαριασμού με αυτό το email στο openstreetmap.org. click_the_link: Εάν πρόκειται για σας, κάντε κλικ στον παρακάτω σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας. - lost_password_html: - greeting: Γεια, - hopefully_you: Κάποιος (πιθανότατα εσείς) έχει ζητήσει επαναφορά του κωδικού - πρόσβασης του λογαριασμού στο openstreetmap.org που αντιστοιχεί σε αυτήν τη - διεύθυνση ηλεκτρονικού ταχυδρομείου. - click_the_link: Εάν είστε εσείς, παρακαλούμε κάντε κλικ στον παρακάτω σύνδεσμο - για να γίνει επαναφορά του κωδικού σας. note_comment_notification: anonymous: Ανώνυμος χρήστης greeting: Γεια, @@ -1624,18 +1602,6 @@ el: δεν το κάνετε. Μπορείτε να κάνετε τις επεξεργασίες σας δημόσιες από την %{user_page}. user_page_link: σελίδα χρήστη anon_edits_link_text: Μάθετε γιατί συμβαίνει αυτό. - flash_player_required_html: Χρειάζεστε Flash player για να χρησιμοποιήσετε το - Potlatch, το Flash πρόγραμμα επεξεργασίας του OpenStreetMap. Μπορείτε να κάνετε λήψη του Flash Player από - την τοποθεσία Adobe.com. Πολλές - άλλες επιλογές είναι επίσης διαθέσιμες για επεξεργασία στο OpenStreetMap. - potlatch_unsaved_changes: Έχετε μη αποθηκευμένες αλλαγές. (Για να αποθηκεύσετε - στο Potlatch, πρέπει να αποεπιλέξτε οποιαδήποτε διαδρομή ή κόμβο, αν επεξεργάζεστε - σε ζωντανή λειτουργία, ή απλά πατήστε «Αποθήκευση» εάν έχετε κουμπί αποθήκευσης.) - potlatch2_not_configured: Το Potlatch 2 δεν έχει ρυθμιστεί - παρακαλούμε δείτε - https://wiki.openstreetmap.org/wiki/The_Rails_Port - potlatch2_unsaved_changes: Έχετε μη αποθηκευμένες αλλαγές. (Για να αποθηκεύσετε - στο Potlatch 2, πρέπει να κάνετε κλικ στο «Αποθήκευση».) id_not_configured: Ο iD δεν έχει ρυθμιστεί no_iframe_support: Ο περιηγητής σας δεν υποστηρίζει το στοιχείο iframe του HTML, που είναι απαραίτητο για αυτήν την λειτουργία. diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index c2e46e43f..214269316 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -2,6 +2,7 @@ # Exported from translatewiki.net # Export driver: phpyaml # Author: Abijeet Patro +# Author: Alefar # Author: Andibing # Author: BEANS # Author: Bjh21 @@ -20,6 +21,7 @@ # Author: Jlrb+ # Author: Kosovastar # Author: Macofe +# Author: Maro21 # Author: Meno25 # Author: Michel Bakni # Author: Mvolz @@ -106,11 +108,17 @@ en-GB: way_tag: Way Tag attributes: client_application: - callback_url: Callback URL + name: Name (Required) + url: Main Application URL (Required) + callback_url: 'Callback URL:' support_url: Support URL + allow_read_prefs: read their user preferences + allow_write_prefs: modify their user preferences + allow_write_diary: create diary entries, comments and make friends allow_write_api: modify the map allow_read_gpx: read their private GPS traces allow_write_gpx: upload GPS traces + allow_write_notes: modify notes diary_comment: body: Body diary_entry: @@ -139,6 +147,9 @@ en-GB: title: Subject body: Body recipient: Recipient + report: + category: 'Select a reason for your report:' + details: Please provide some more details about the problem (required). user: email: E-mail active: Active @@ -146,6 +157,7 @@ en-GB: description: Description languages: Languages pass_crypt: Password + pass_crypt_confirmation: Confirm Password help: trace: tagstring: comma delimited @@ -193,20 +205,15 @@ en-GB: with_name_html: '%{name} (%{id})' editor: default: Default (currently %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (in-browser editor) id: name: iD description: iD (in-browser editor) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (in-browser editor) remote: name: Remote Control description: Remote Control (JOSM or Merkaartor) auth: providers: + none: None openid: OpenID google: Google facebook: Facebook @@ -302,6 +309,7 @@ en-GB: entry_html: Relation %{relation_name} entry_role_html: Relation %{relation_name} (as %{relation_role}) not_found: + title: Not Found sorry: 'Sorry, %{type} #%{id} could not be found.' type: node: node @@ -310,6 +318,7 @@ en-GB: changeset: changeset note: note timeout: + title: Timeout Error sorry: Sorry, the data for the %{type} with the id %{id}, took too long to retrieve. type: node: node @@ -408,13 +417,8 @@ en-GB: new: title: New Diary Entry form: - subject: 'Subject:' - body: 'Body:' - language: 'Language:' location: 'Location:' - latitude: 'Latitude:' - longitude: 'Longitude:' - use_map_link: use map + use_map_link: Use map index: title: Users' diaries title_friends: Friends' diaries @@ -423,6 +427,7 @@ en-GB: in_language_title: Diary Entries in %{language} new: New Diary Entry new_title: Compose a new entry in my user diary + my_diary: My Diary no_entries: No diary entries recent_entries: Recent diary entries older_entries: Older Entries @@ -443,6 +448,7 @@ en-GB: your spelling, or maybe the link you clicked is wrong. diary_entry: posted_by_html: Posted by %{link_user} on %{created} in %{language_link} + updated_at_html: Last updated on %{updated}. comment_link: Comment on this entry reply_link: Send a message to the author comment_count: @@ -512,6 +518,7 @@ en-GB: chair_lift: Chairlift drag_lift: Drag Lift gondola: Gondola Lift + magic_carpet: Magic Carpet Lift platter: Platter Lift pylon: Pylon station: Aerialway Station @@ -538,7 +545,9 @@ en-GB: bench: Bench bicycle_parking: Cycle Parking bicycle_rental: Cycle Rental + bicycle_repair_station: Bicycle Repair Station biergarten: Beer Garden + blood_bank: Blood Bank boat_rental: Boat Rental brothel: Brothel bureau_de_change: Bureau de Change @@ -555,6 +564,7 @@ en-GB: clock: Clock college: College community_centre: Community Centre + conference_centre: Conference Centre courthouse: Court crematorium: Crematorium dentist: Dentist @@ -562,6 +572,7 @@ en-GB: drinking_water: Drinking Water driving_school: Driving School embassy: Embassy + events_venue: Events Venue fast_food: Fast Food ferry_terminal: Ferry Terminal fire_station: Fire Station @@ -578,8 +589,11 @@ en-GB: kindergarten: Nursery School language_school: Language school library: Library + loading_dock: Loading Dock + love_hotel: Love Hotel marketplace: Marketplace monastery: Monastery + money_transfer: Money Transfer motorcycle_parking: Motorcycle Parking music_school: Music School nightclub: Night Club @@ -594,6 +608,7 @@ en-GB: post_office: Post Office prison: Prison pub: Pub + public_bath: Public Bath public_building: Public Building recycling: Recycling Point restaurant: Restaurant @@ -632,12 +647,17 @@ en-GB: building: apartment: Apartment apartments: Apartments + bungalow: Bungalow cabin: Cabin + chapel: Chapel + church: Church college: College Building commercial: Commercial Building construction: Building under Construction garage: Garage garages: Garages + hospital: Hospital + hotel: Hotel house: House industrial: Industrial Building roof: Roof @@ -784,6 +804,7 @@ en-GB: miniature_golf: Miniature Golf nature_reserve: Nature Reserve park: Park + picnic_table: Picnic Table pitch: Sports Pitch playground: Playground recreation_ground: Recreation Ground @@ -798,13 +819,21 @@ en-GB: "yes": Leisure man_made: adit: Adit + advertising: Advertising + antenna: Antenna/Antennae + avalanche_protection: Avalanche Protection beacon: Beacon + beam: Beam beehive: Bee Hive breakwater: Breakwater bridge: Bridge bunker_silo: Bunker + cairn: Cairn chimney: Chimney + clearcut: Clearcut + communications_tower: Communications Tower crane: Crane + cross: Cross dolphin: Mooring Post dyke: Dyke embankment: Embankment @@ -813,6 +842,7 @@ en-GB: groyne: Groyne kiln: Kiln lighthouse: Lighthouse + manhole: Manhole mast: Mast mine: Mine mineshaft: Mine Shaft @@ -1144,7 +1174,6 @@ en-GB: footer: You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl} message_notification: - subject_header: '[OpenStreetMap] %{subject}' hi: Hi %{to_user}, header: '%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:' @@ -1176,28 +1205,16 @@ en-GB: information to get you started. email_confirm: subject: '[OpenStreetMap] Confirm your e-mail address' - email_confirm_plain: - greeting: Hi, - hopefully_you: Someone (hopefully you) would like to change their email address - over at %{server_url} to %{new_address}. - click_the_link: If this is you, please click the link below to confirm the change. - email_confirm_html: greeting: Hi, hopefully_you: Someone (hopefully you) would like to change their email address over at %{server_url} to %{new_address}. click_the_link: If this is you, please click the link below to confirm the change. lost_password: subject: '[OpenStreetMap] Password reset request' - lost_password_plain: greeting: Hi, hopefully_you: Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account. click_the_link: If this is you, please click the link below to reset your password. - lost_password_html: - greeting: Hi, - hopefully_you: Someone (possibly you) has asked for the password to be reset - on this e-mail address's openstreetmap.org account. - click_the_link: If this is you, please click the link below to reset your password. note_comment_notification: anonymous: An anonymous user greeting: Hi, @@ -1485,17 +1502,6 @@ en-GB: user_page_link: user page anon_edits_html: (%{link}) anon_edits_link_text: Find out why this is the case. - flash_player_required_html: You need a Flash player to use Potlatch, the OpenStreetMap - Flash editor. You can download - Flash Player from Adobe.com. Several - other options are also available for editing OpenStreetMap. - potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you - should deselect the current way or point, if editing in live mode, or click - save if you have a save button.) - potlatch2_not_configured: Potlatch 2 has not been configured - please see https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 - for more information - potlatch2_unsaved_changes: You have unsaved changes. (To save in Potlatch 2, - you should click save.) id_not_configured: iD has not been configured no_iframe_support: Your browser doesn't support HTML iframes, which are necessary for this feature. diff --git a/config/locales/en.yml b/config/locales/en.yml index e1c180253..a520fcb02 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -175,18 +175,12 @@ en: with_name_html: "%{name} (%{id})" editor: default: "Default (currently %{name})" - potlatch: - name: "Potlatch 1" - description: "Potlatch 1 (in-browser editor)" id: name: "iD" description: "iD (in-browser editor)" - potlatch2: - name: "Potlatch 2" - description: "Potlatch 2 (in-browser editor)" remote: name: "Remote Control" - description: "Remote Control (JOSM or Merkaartor)" + description: "Remote Control (JOSM, Potlatch, Merkaartor)" auth: providers: none: None @@ -399,13 +393,8 @@ en: new: title: New Diary Entry form: - subject: "Subject:" - body: "Body:" - language: "Language:" - location: "Location:" - latitude: "Latitude:" - longitude: "Longitude:" - use_map_link: "use map" + location: Location + use_map_link: Use Map index: title: "Users' diaries" title_friends: "Friends' diaries" @@ -1578,6 +1567,24 @@ en: as_unread: "Message marked as unread" destroy: destroyed: "Message deleted" + shared: + markdown_help: + title_html: Parsed with kramdown + headings: Headings + heading: Heading + subheading: Subheading + unordered: Unordered list + ordered: Ordered list + first: First item + second: Second item + link: Link + text: Text + image: Image + alt: Alt text + url: URL + richtext_field: + edit: Edit + preview: Preview site: about: next: Next @@ -1782,10 +1789,6 @@ en: anon_edits_html: "(%{link})" anon_edits_link: "https://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits" anon_edits_link_text: "Find out why this is the case." - flash_player_required_html: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can download Flash Player from Adobe.com. Several other options are also available for editing OpenStreetMap.' - potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in live mode, or click save if you have a save button.)" - potlatch2_not_configured: "Potlatch 2 has not been configured - please see https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 for more information" - potlatch2_unsaved_changes: "You have unsaved changes. (To save in Potlatch 2, you should click save.)" id_not_configured: "iD has not been configured" no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature." export: @@ -1889,6 +1892,10 @@ en: url: https://wiki.openstreetmap.org/ title: OpenStreetMap Wiki description: Browse the wiki for in-depth OpenStreetMap documentation. + potlatch: + removed: Your default OpenStreetMap editor is set as Potlatch. Because Adobe Flash Player has been withdrawn, Potlatch is no longer available to use in a web browser. + desktop_html: You can still use Potlatch by downloading the desktop application for Mac and Windows. + id_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. Change your user settings here. sidebar: search_results: Search Results close: Close diff --git a/config/locales/eo.yml b/config/locales/eo.yml index 7645edab8..c3c6651fa 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -3,8 +3,10 @@ # Export driver: phpyaml # Author: Abijeet Patro # Author: Airon90 +# Author: Alefar # Author: Bwildenhain.BO # Author: Cfoucher +# Author: Javiero # Author: Kastanoto # Author: KuboF # Author: Lucas @@ -189,18 +191,12 @@ eo: other: antaŭ %{count} jaroj editor: default: Implicita (nune %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (en-foliumila redaktilo) id: name: iD description: iD (en-foliumila redaktilo) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (en-foliumila redaktilo) remote: name: ekstera redaktilo - description: ekstera redaktilo (JOSM aŭ Merkaartor) + description: ekstera redaktilo (JOSM, Potlatch, Merkaartor) auth: providers: none: Neniu @@ -419,13 +415,8 @@ eo: new: title: Nova taglibra afiŝo form: - subject: 'Temo:' - body: 'Enhavo:' - language: 'Lingvo:' - location: 'Pozicio:' - latitude: 'Latitudo:' - longitude: 'Longitudo:' - use_map_link: uzi mapon + location: Pozicio + use_map_link: Montri sur mapo index: title: Taglibroj de uzantoj title_friends: Taglibroj de amikoj @@ -454,7 +445,8 @@ eo: body: Bedaŭrinde ne ekzistas taglibra afiŝo kun la identigilo %{id}. Bonvolu kontroli la literumadon, aŭ eble vi alklakis eraran ligilon. diary_entry: - posted_by_html: Publikigita de %{link_user} je %{created} en %{language_link} + posted_by_html: Publikigita de %{link_user} je %{created} en %{language_link}. + updated_at_html: Antaŭe ĝisdatigita je %{updated}. comment_link: Komenti pri ĉi tiu afiŝo reply_link: Sendi mesaĝon al la aŭtoro comment_count: @@ -1266,12 +1258,15 @@ eo: "yes": Akvovojo admin_levels: level2: Limo de lando (niv.2) + level3: Regionlimo level4: Limo de provinco (niv.4) level5: Limo de regiono (niv.5) level6: Limo de distrikto (niv.6) + level7: Limo de komunumo (niv.7) level8: Limo de urbo (niv.8) level9: Limo de kvartalo (niv.9) level10: Limo de subkvartalo (niv.10) + level11: Limo de najbaraĵo (niv.11) types: cities: Urbegoj towns: Urboj @@ -1435,11 +1430,20 @@ eo: hi: Saluton %{to_user}, header: '%{from_user} komentis pri la OpenStreetMap-taglibra afiŝo kun la temo %{subject}:' + header_html: '%{from_user} komentis pri la OpenStreetMap-taglibra afiŝo kun + la temo %{subject}:' footer: Vi ankaŭ povas legi la komenton ĉe %{readurl} kaj komenti ĝin ĉe %{commenturl} aŭ respondi al la aŭtoro ĉe %{replyurl} + footer_html: Vi ankaŭ povas legi la komenton ĉe %{readurl} kaj komenti ĝin ĉe + %{commenturl} aŭ respondi al la aŭtoro ĉe %{replyurl} message_notification: + subject: '[OpenStreetMap] %{message_title}' hi: Saluton %{to_user}, header: '%{from_user} sendis al vi mesaĝon tra OpenStreetMap kun la temo %{subject}:' + header_html: '%{from_user} Sendis al vi mesaĝon per OpenStreetMap kun la temo + %{subject}' + footer: Vi ankaŭ povas legi la mesaĝon ĉe %{readurl} kaj sendi mesaĝon al la + aŭtoro ĉe %{replyurl} footer_html: Vi ankaŭ povas legi la mesaĝon ĉe %{readurl} kaj sendi mesaĝon al la aŭtoro ĉe %{replyurl} friendship_notification: @@ -1447,7 +1451,9 @@ eo: subject: '[OpenStreetMap] %{user} aldonis vin kiel amikon' had_added_you: '%{user} aldonis vin kiel amikon je OpenStreetMap.' see_their_profile: Vi povas vidi ties profilon ĉe %{userurl}. + see_their_profile_html: Vi povas vidi ties profilon ĉe %{userurl}. befriend_them: Vi ankaŭ povas aldoni vin kiel amikon ĉe %{befriendurl}. + befriend_them_html: Vi ankaŭ povas aldoni ilin kiel amiko ĉe %{befriendurl} gpx_description: description_with_tags_html: 'Ŝajnas, ke tio ĉi estas via GPX‑dosiero %{trace_name} kun la priskribo %{trace_description} kaj kun la jenaj etikedoj: %{tags}' @@ -1458,6 +1464,7 @@ eo: failed_to_import: 'ne estas enportita sukcese. Eraro:' more_info_html: Pliaj informoj pri eraroj dum enporti GPX‑dosierojn troviĝas ĉe %{url}. + import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures subject: '[OpenStreetMap] Eraro dum enportado de GPX-dosiero' gpx_success: hi: Saluton %{to_user}, @@ -1474,13 +1481,6 @@ eo: welcome: Post konfirmo de konto, ni liveros al vi pliajn informojn kiel komenci. email_confirm: subject: '[OpenStreetMap] Konfirmado de retpoŝtadreso' - email_confirm_plain: - greeting: Saluton, - hopefully_you: Iu (espereble vi) volas ŝanĝi vian retpoŝtadreson je %{server_url} - al %{new_address}. - click_the_link: Se tiu estas vi, bonvolu alklaku la ligilon sube por konfirmi - ŝanĝon de adreso. - email_confirm_html: greeting: Saluton, hopefully_you: Iu (espereble vi) volas ŝanĝi vian retpoŝtadreson je %{server_url} al %{new_address}. @@ -1488,13 +1488,6 @@ eo: ŝanĝon de adreso. lost_password: subject: '[OpenStreetMap] Peto pri restarigo de pasvorto' - lost_password_plain: - greeting: Saluton, - hopefully_you: Iu (espereble vi) volas restarigi la pasvorton por konto je openstreetmap.org - por tiu ĉi retpoŝtadreso. - click_the_link: Se tiu estas vi, bonvolu alklaki la ligilon sube por restarigi - la pasvorton. - lost_password_html: greeting: Saluton, hopefully_you: Iu (espereble vi) volas restarigi la pasvorton por konto je openstreetmap.org por tiu ĉi retpoŝtadreso. @@ -1508,22 +1501,32 @@ eo: subject_other: '[OpenStreetMap] %{commenter} komentis rimarkon pri kiu vi interesiĝas' your_note: '%{commenter} komentis vian rimarkon sur mapo ĉe %{place}.' + your_note_html: '%{commenter} komentis vian rimarkon sur mapo ĉe %{place}.' commented_note: '%{commenter} komentis rimarkon sur mapo pri kiu vi interesiĝas. La rimarko troviĝas ĉe %{place}.' + commented_note_html: '%{commenter} komentis rimarkon sur la mapo pri kiu vi + interesiĝas. La rimarko troviĝas ĉe %{place}.' closed: subject_own: '[OpenStreetMap] %{commenter} solvis vian rimarkon' subject_other: '[OpenStreetMap] %{commenter} solvis rimarkon pri kiu vi interesiĝas' your_note: '%{commenter} solvis vian rimarkon sur mapo ĉe %{place}.' + your_note_html: '%{commenter} solvis vian rimarkon sur la mapo ĉe %{place}.' commented_note: '%{commenter} solvis rimarkon sur mapo pri kiu vi interesiĝas. La rimarko troviĝis ĉe %{place}.' + commented_note_html: '%{commenter} solvis rimarkon sur la mapo pri kiu vi + interesiĝas. La rimarko troviĝis ĉe %{place}.' reopened: subject_own: '[OpenStreetMap] %{commenter} remalfermis vian rimarkon' subject_other: '[OpenStreetMap] %{commenter} remalfermis rimarkon pri kiu vi interesiĝis' your_note: '%{commenter} remalfermis vian rimarkon sur mapo ĉe %{place}.' + your_note_html: '%{commenter} remalfermis vian rimarkon sur la mapo ĉe %{place}.' commented_note: '%{commenter} remalfermis rimarkon sur mapo pri kiu vi interesiĝis. La rimarko troviĝis ĉe %{place}.' + commented_note_html: '%{commenter} remalfermis rimarkon sur la mapo pri kiu + vi interesiĝis. La rimarko troviĝis ĉe %{place}.' details: Pli da detaloj pri la rimarko, vi povas trovi je %{url}. + details_html: Pli da detaloj pri la noto troveblas ĉe %{url}. changeset_comment_notification: hi: Saluton %{to_user}, greeting: Saluton, @@ -1532,13 +1535,20 @@ eo: subject_other: '[OpenStreetMap] %{commenter} komentis ŝanĝaron pri kiu vi interesiĝas' your_changeset: '%{commenter} je %{time} komentis vian ŝanĝaron' + your_changeset_html: '%{commenter} lasis komenton ĉe %{time}' commented_changeset: '%{commenter} je %{time} komentis ŝanĝaron observatan de vi, kreitan de %{changeset_author}' + commented_changeset_html: '%{commenter} je %{time} komentis ŝanĝaron observatan + de vi, kreitan de %{changeset_author}' partial_changeset_with_comment: kun komento '%{changeset_comment}' + partial_changeset_with_comment_html: kun komento '%{changeset_comment}' partial_changeset_without_comment: sen komento details: Pli da detaloj pri la ŝanĝaro povas esti trovita ĉe %{url}. + details_html: Pli da detaloj pri la ŝanĝaro povas esti trovita ĉe %{url}. unsubscribe: Por malaboni el ĝisdatigoj pri ĉi tiu ŝanĝaro, vizitu %{url} kaj klaku "Malobservi". + unsubscribe_html: Por malaboni la ĝisdatigojn de ĉi tiu ŝanĝaro, vizitu %{url}kaj + alklaku "Malaboni". messages: inbox: title: Alvenkesto @@ -1614,6 +1624,24 @@ eo: as_unread: Mesaĝo markita kiel nelegitan destroy: destroyed: Mesaĝo forigita + shared: + markdown_help: + title_html: Sintakse analizita per kramdown + headings: Titoloj + heading: Titolo + subheading: Subtitolo + unordered: Malordigita listo + ordered: Ordigita listo + first: Unua elemento + second: Dua elemento + link: Ligilo + text: Teksto + image: Bildo + alt: Kromteksto + url: Retadreso + richtext_field: + edit: Redakti + preview: Antaŭvidi site: about: next: Sekva @@ -1788,17 +1816,6 @@ eo: ilin kiel publikan ĉe via %{user_page}. user_page_link: uzantpaĝo anon_edits_link_text: Tie ĉi vi sciiĝis kiel. - flash_player_required_html: Por uzi la OpenStreetMap-redaktilon 'Potlatch', - vi bezonas la kromprogramon Flash. Vi povas elŝuti - Flash Player el retpaĝo de Adobe.com. Kelkaj - aliaj redaktiloj estas disponeblaj por redakti OpenStreetMap. - potlatch_unsaved_changes: Vi havas nekonservitajn ŝanĝojn. (Por konservi ŝanĝojn - en Potlatch, malelektu nune elektitan linion aŭ punkton se vi redaktas en - 'rekta reĝimo', aŭ alklaku butonon 'konservi', se ĝi videblas.) - potlatch2_not_configured: Potlatch 2 ne estas agordita - legu https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 - por pli da informoj - potlatch2_unsaved_changes: Vi havas nekonservitajn ŝanĝojn. (Por konservi ilin - en Potlatch 2, alklaku 'konservi'.) id_not_configured: iD ne estas agordita no_iframe_support: Via foliumilo ne subtenas 'HTML iframes', ili estas bezonataj por tiu ĉi eblo. @@ -1905,6 +1922,15 @@ eo: url: https://wiki.openstreetmap.org/wiki/Eo:Main_Page title: OpenStreetMap-vikio description: Esploru la vikion por akiri detalan dokumentaron pri OpenStreetMap. + potlatch: + removed: Via implicita OpenStreetMap‑reaktilo estas Potlatch. Pro la fakto, + ke Adobe Flash Player estis eksigita, la redaktilo Potlatch ne estas plu uzebla + per retfoliumilo. + 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 + tien ĉi por ŝanĝi agordojn. sidebar: search_results: Serĉrezultoj close: Fermi diff --git a/config/locales/es.yml b/config/locales/es.yml index fda3690b4..186ad46f2 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -28,6 +28,7 @@ # Author: Indiralena # Author: Invadinado # Author: James +# Author: JanKlaaseen # Author: Javiersanp # Author: Jelou # Author: Jlrb+ @@ -58,6 +59,7 @@ # Author: Pompilos # Author: Remux # Author: Rodm23 +# Author: Rodney Araujo # Author: Rubenwap # Author: Ruila # Author: Sim6 @@ -76,7 +78,7 @@ es: friendly: '%e de %B de %Y a las %H:%M' helpers: file: - prompt: Elija el archivo + prompt: Seleccione Archivo submit: diary_comment: create: Guardar @@ -84,7 +86,7 @@ es: create: Publicar update: Actualizar issue_comment: - create: Añadir comentario + create: Añadir Comentario message: create: Enviar client_application: @@ -95,22 +97,23 @@ es: update: Guardar redacción trace: create: Subir - update: Guardar cambios + update: Guardar Cambios user_block: create: Crear bloqueo - update: Actualizar el bloqueo + update: Actualizar bloqueo activerecord: errors: messages: - invalid_email_address: no parece ser una dirección de correo electrónico válida + invalid_email_address: no parece que la dirección de correo electrónico no + es válida email_address_not_routable: no es enrutable models: - acl: Lista de control de acceso + acl: Lista de Control del Acceso changeset: Conjunto de cambios - changeset_tag: Etiqueta del conjunto de cambios + changeset_tag: Etiqueta del Conjunto de Cambios country: País - diary_comment: Comentario de diario - diary_entry: Entrada de diario + diary_comment: Comentario de Diario + diary_entry: Entrada de Diario friend: Amigo issue: Problema language: Idioma @@ -118,34 +121,34 @@ es: node: Nodo node_tag: Etiqueta del nodo notifier: Notificador - old_node: Nodo antiguo - old_node_tag: Etiqueta de nodo antiguo + old_node: Antiguo Nodo + old_node_tag: Etiqueta del Antiguo Nodo old_relation: Relación antigua - old_relation_member: Miembro de la relación antigua - old_relation_tag: Etiqueta de la relación antigua - old_way: Ví­a antigua - old_way_node: Nodo de la vía antigua - old_way_tag: Etiqueta de la ví­a antigua + old_relation_member: Miembro de la Antigua Relación + old_relation_tag: Etiqueta de la Antigua Relación + old_way: Antigua Vía + old_way_node: Nodo de la Antigua Vía + old_way_tag: Etiqueta de la Antigua Ví­a relation: Relación - relation_member: Miembro de la relación - relation_tag: Etiqueta de la relación + relation_member: Miembro de la Relación + relation_tag: Etiqueta de la Relación report: Informe session: Sesión trace: Traza - tracepoint: Punto de la traza - tracetag: Etiqueta de la traza + tracepoint: Punto de la Traza + tracetag: Etiqueta de la Traza user: Usuario - user_preference: Preferencia de usuario - user_token: Pase de usuario + user_preference: Preferencia de Usuario + user_token: Ficha de Usuario way: Vía - way_node: Nodo de la vía - way_tag: Etiqueta de la ví­a + way_node: Nodo de la Vía + way_tag: Etiqueta de la Ví­a attributes: client_application: - name: Nombre (Requerido) - url: URL de la aplicación principal (Requerido) - callback_url: URL de devolución de llamada - support_url: URL de asistencia + name: Nombre (Obligatorio) + url: URL de la Aplicación Principal (Obligatorio) + callback_url: URL de Devolución de Llamada + support_url: URL de Asistencia allow_read_prefs: leer sus preferencias de usuario allow_write_prefs: modificar sus preferencias de usuario allow_write_diary: crear entradas de diario, comentarios y hacer amigos @@ -171,9 +174,9 @@ es: size: Tamaño latitude: Latitud longitude: Longitud - public: Pública + public: Público description: Descripción - gpx_file: Cargar archivo GPX + gpx_file: Cargar Archivo GPX visibility: Visibilidad tagstring: Etiquetas message: @@ -182,12 +185,12 @@ es: body: Cuerpo recipient: Destinatario report: - category: Seleccione un motivo para su denuncia - details: Proporcione más detalles sobre el problema (obligatorio). + category: Seleccione un motivo de su informe + details: Por favor, proporcione más detalles sobre el problema (obligatorio). user: email: Correo electrónico active: Activo - display_name: Nombre para mostrar + display_name: Nombre para Mostrar description: Descripción languages: Idiomas pass_crypt: Contraseña @@ -198,17 +201,17 @@ es: datetime: distance_in_words_ago: about_x_hours: - one: hace cerca de 1 hora - other: hace cerca de %{count} horas + one: hace 1 hora + other: hace %{count} horas about_x_months: - one: hace cerca de 1 mes - other: hace cerca de %{count} meses + one: hace 1 mes + other: hace %{count} meses about_x_years: - one: hace cerca de 1 año - other: hace cerca de %{count} años + one: hace 1 año + other: hace %{count} años almost_x_years: - one: hace casi 1 año - other: hace casi %{count} años + one: hace 1 año + other: hace %{count} años half_a_minute: hace medio minuto less_than_x_seconds: one: hace menos de 1 segundo @@ -238,25 +241,19 @@ es: with_name_html: '%{name} (%{id})' editor: default: Predeterminado (actualmente %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (editor en el navegador) id: name: iD description: iD (editor en el navegador) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (editor en el navegador) remote: - name: Control remoto - description: Control remoto (JOSM o Merkaartor) + name: Control Remoto + description: Control Remoto (JOSM, Potlatch o Merkaartor) auth: providers: none: Ninguno openid: OpenID google: Google facebook: Facebook - windowslive: Microsoft + windowslive: Windows Live github: GitHub wikipedia: Wikipedia api: @@ -272,7 +269,7 @@ es: reopened_at_by_html: Reactivado %{when} por %{user} rss: title: Notas de OpenStreetMap - description_area: Una lista de notas, informadas, comentadas o cerradas en + description_area: Una lista de notas, informes, comentarios o cerrados en su área [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] description_item: Agregador RSS para la nota %{id} opened: nueva nota (cerca de %{place}) @@ -377,8 +374,8 @@ es: note: nota redacted: redaction: Redacción %{id} - message_html: La versión %{version} de este %{type} no se puede mostrar tal - como ha sido redactada. Consulte %{redaction_link} para obtener más detalles. + message_html: La versión %{version} de este %{type} no se puede mostrar porque + se ha censurado. Consúltese %{redaction_link} para obtener más detalles. type: node: nodo way: vía @@ -469,13 +466,8 @@ es: new: title: Nueva entrada en el diario form: - subject: 'Asunto:' - body: 'Texto:' - language: 'Idioma:' - location: 'Ubicación:' - latitude: 'Latitud:' - longitude: 'Longitud:' - use_map_link: usar mapa + location: Ubicación + use_map_link: Usar mapa index: title: Diarios de usuarios title_friends: Diarios de amigos @@ -504,7 +496,8 @@ es: body: No hay ninguna entrada de diario o comentario con el identificador %{id}. Revise su ortografía, o tal vez el enlace en el que hizo clic es incorrecto. diary_entry: - posted_by_html: Publicado por %{link_user} el %{created} en %{language_link} + posted_by_html: Publicado por %{link_user} el %{created} en %{language_link}. + updated_at_html: Última actualización en %{updated}. comment_link: Comentar esta entrada reply_link: Enviar un mensaje al autor comment_count: @@ -693,14 +686,14 @@ es: townhall: Ayuntamiento training: Centro de formación university: Universidad - vehicle_inspection: Inspección vehicular + vehicle_inspection: Inspección de vehículos vending_machine: Máquina expendedora veterinary: Clínica veterinaria village_hall: Sala del pueblo waste_basket: Papelera waste_disposal: Contenedor de basura waste_dump_site: Sitio de vertedero de desechos - watering_place: Lugar de riego + watering_place: Abrevadero water_point: Punto de agua weighbridge: Báscula de puente "yes": Servicio @@ -735,7 +728,7 @@ es: dormitory: Residencia de estudiantes duplex: Casa dúplex farm: Casa de campo - farm_auxiliary: Casa de campo auxiliar + farm_auxiliary: Edificio auxiliar de granja garage: Garaje garages: Garajes greenhouse: Invernadero @@ -779,7 +772,7 @@ es: confectionery: Repostería dressmaker: Modista electrician: Electricista - electronics_repair: Reparación de electrónicos + electronics_repair: Reparación de aparatos electrónicos gardener: Jardinero glaziery: Cristalería handicraft: Artesanía @@ -802,7 +795,7 @@ es: assembly_point: Punto de reunión defibrillator: Desfibrilador fire_xtinguisher: Extintor de incendios - fire_water_pond: Estanque de agua para fuego + fire_water_pond: Estanque de agua para incendios landing_site: Lugar de aterrizaje de emergencia life_ring: Salvavidas de emergencia phone: Teléfono de emergencia @@ -820,7 +813,7 @@ es: cycleway: Bicisenda elevator: Ascensor emergency_access_point: Acceso de emergencia - emergency_bay: Bahía de emergencia + emergency_bay: Apartadero de emergencia footway: Sendero ford: Vado give_way: Señal de ceda el paso @@ -835,7 +828,7 @@ es: platform: Plataforma primary: Carretera primaria primary_link: Carretera primaria - proposed: Carretera proyectada + proposed: Vía en proyecto raceway: Pista de carreras residential: Calle rest_area: Área de descanso @@ -860,7 +853,7 @@ es: unclassified: Carretera sin clasificar "yes": Camino historic: - aircraft: Aviones históricos + aircraft: Avión histórico archaeological_site: Yacimiento arqueológico bomb_crater: Cráter de bomba histórico battlefield: Campo de batalla @@ -978,7 +971,7 @@ es: breakwater: Rompeolas bridge: Puente bunker_silo: Búnker - cairn: Mojón + cairn: Mojón de piedras chimney: Chimenea clearcut: Claro communications_tower: Torre de comunicaciones @@ -1001,12 +994,12 @@ es: pier: Muelle pipeline: Tubería pumping_station: Estación de bombeo - reservoir_covered: Embalse cubierto + reservoir_covered: Depósito cubierto silo: Silo snow_cannon: Cañón de nieve - snow_fence: Valla de nieve + snow_fence: Barrera anti avalanchas de nieve storage_tank: Tanque de almacenamiento - street_cabinet: Gabinete de calle + street_cabinet: Armario de servicios surveillance: Vigilancia telescope: Telescopio tower: Torre @@ -1025,7 +1018,7 @@ es: barracks: Barracas bunker: Búnker checkpoint: Puesto de control - trench: Zanja + trench: Trinchera "yes": Ejército mountain_pass: "yes": Paso de montaña @@ -1089,12 +1082,12 @@ es: it: Oficina de TI lawyer: Abogado logistics: Oficina de logística - newspaper: Oficina de periódicos + newspaper: Oficina de periódico ngo: Oficina de ONG notary: Notario religion: Oficina religiosa research: Oficina de investigación - tax_advisor: Oficina de asesor impositivo + tax_advisor: Oficina de asesor fiscal telecommunication: Oficina de telecomunicaciones travel_agent: Agencia de viajes "yes": Oficina @@ -1161,7 +1154,7 @@ es: bakery: Panadería bathroom_furnishing: Mobiliario de baño beauty: Salón de belleza - bed: Ropa de cama + bed: Colchonería beverages: Tienda de bebidas bicycle: Tienda de bicicletas bookmaker: Casa de apuestas @@ -1175,7 +1168,7 @@ es: charity: Tienda benéfica cheese: Tienda de quesos chemist: Droguería - chocolate: Chocolate + chocolate: Chocolatería clothes: Tienda de ropa coffee: Tienda de café computer: Tienda de informática @@ -1198,7 +1191,7 @@ es: fabric: Tienda de telas farm: Tienda de productos agrícolas fashion: Tienda de moda - fishing: Tienda de suministros de pesca + fishing: Tienda de artículos pesca florist: Floristería food: Tienda de alimentación frame: Tienda de marcos @@ -1213,7 +1206,7 @@ es: hairdresser: Peluquería hardware: Ferretería health_food: Tienda de comida saludable - hearing_aids: Audífonos + hearing_aids: Tienda de audífonos herbalist: Herbolario hifi: Hi-Fi houseware: Tienda de artículos para el hogar @@ -1244,7 +1237,7 @@ es: pawnbroker: Casa de empeños perfumery: Perfumería pet: Tienda de mascotas - pet_grooming: Aseo de mascotas + pet_grooming: Lavadero de mascotas photo: Tienda de fotografía seafood: Mariscos second_hand: Tienda de segunda mano @@ -1252,7 +1245,7 @@ es: shoes: Zapatería sports: Tienda de deportes stationery: Papelería - storage_rental: Alquiler de almacenamiento + storage_rental: Trasteros de alquiler supermarket: Supermercado tailor: Sastre tattoo: Estudio de tatuajes @@ -1271,7 +1264,7 @@ es: "yes": Tienda tourism: alpine_hut: Refugio de montaña - apartment: Apartamento de vacaciones + apartment: Apartamento turístico artwork: Obra de arte attraction: Atracción turística bed_and_breakfast: Alojamiento y desayuno (B&B) @@ -1492,13 +1485,20 @@ es: hi: Hola %{to_user}, header: '%{from_user} ha comentado sobre en la entrada de diario con el asunto %{subject}:' + header_html: '%{from_user} ha comentado la entrada de diario con el asunto %{subject}:' footer: También puede leer el comentario en %{readurl} y puede comentar en %{commenturl} o responder en %{replyurl} + footer_html: También puede leer el comentario en %{readurl} y puede comentar + en %{commenturl} o responder en %{replyurl} message_notification: - subject_header: '[OpenStreetMap] %{subject}' + subject: '[OpenStreetMap] %{message_title}' hi: Hola %{to_user}, header: '%{from_user} le ha enviado un mensaje a través de OpenStreetMap con el asunto %{subject}:' + header_html: '%{from_user} te ha enviado un mensaje a través de OpenStreetMap + con el asunto %{subject}:' + footer: También puede leer el mensaje en %{readurl} y enviar un mensaje al autor + en %{replyurl} footer_html: También puede leer el mensaje en %{readurl} y puede responder en %{replyurl} friendship_notification: @@ -1506,9 +1506,19 @@ es: subject: '[OpenStreetMap] %{user} le ha añadido como amigo' had_added_you: '%{user} le ha añadido como amigo en OpenStreetMap' see_their_profile: Puede ver su perfil en %{userurl}. + see_their_profile_html: Puede ver su perfil en %{userurl}. befriend_them: También puede añadirle como amigo en %{befriendurl}. + befriend_them_html: También puede añadirle como amigo en %{befriendurl}. + gpx_description: + description_with_tags_html: 'Parece que el archivo GPX %{trace_name} con la + descripción %{trace_description} y las etiquetas siguientes: %{tags}' + description_with_no_tags_html: Parece que el archivo GPX %{trace_name} con la + descripción %{trace_description} sin etiquetas gpx_failure: + hi: Hola %{to_user}, failed_to_import: 'no ha podido ser importado. El mensaje de error es:' + more_info_html: Más información sobre los errores de importación de GPX y y + cómo evitarlos se pueden encontrar en %{url}. import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures subject: '[OpenStreetMap] Fallo al importar GPX' gpx_success: @@ -1528,28 +1538,13 @@ es: información adicional para ayudarle a empezar. email_confirm: subject: '[OpenStreetMap] Confirme su dirección de correo electrónico' - email_confirm_plain: greeting: Hola, hopefully_you: Alguien (esperemos que usted) desea cambiar su dirección de correo electrónico a través de %{server_url} a %{new_address}. click_the_link: Si es usted, haga clic en el enlace de abajo para confirmar el cambio. - email_confirm_html: - greeting: Hola, - hopefully_you: Alguien (esperemos que usted) quiere cambiar la dirección de - correo en %{server_url} a %{new_address}. - click_the_link: Si es usted, haga clic en el enlace de abajo para confirmar - el cambio. lost_password: subject: '[OpenStreetMap] Petición para restablecer la contraseña' - lost_password_plain: - greeting: Hola, - hopefully_you: Alguien (posiblemente usted) ha solicitado que se restablezca - la contraseña en la cuenta de openstreetmap.org de esta dirección de correo - electrónico. - click_the_link: Si es usted, haga clic en el enlace a continuación para restablecer - su contraseña. - lost_password_html: greeting: Hola, hopefully_you: Alguien (posiblemente usted) ha solicitado que se restablezca la contraseña en la cuenta de openstreetmap.org de esta dirección de correo @@ -1565,23 +1560,36 @@ es: le interesa' your_note: '%{commenter} ha dejado un comentario en una de sus notas del mapa cerca de %{place}.' + your_note_html: '%{commenter} ha dejado un comentario en una de sus notas + de mapa cerca de %{place}' commented_note: '%{commenter} ha dejado un comentario en una nota del mapa que ha comentado. La nota está cerca de %{place}.' + commented_note_html: '%{commenter} ha dejado un comentario en una nota del + mapa que usted ha comentado. La nota está cerca de %{place}.' closed: subject_own: '[OpenStreetMap] %{commenter} ha resuelto una de sus notas' subject_other: '[OpenStreetMap] %{commenter} ha resuelto una nota que le interesa' your_note: '%{commenter} ha resuelto una de sus notas del mapa cerca de %{place}.' + your_note_html: '%{commenter} ha resuelto una de sus notas del mapa cerca + de %{place}.' commented_note: '%{commenter} ha resuelto una nota de mapa que ha comentado. La nota está cerca de %{place}.' + commented_note_html: '%{commenter} ha resuelto una nota del mapa en la que + usted ha comentado. La nota está cerca de %{place}.' reopened: subject_own: '[OpenStreetMap] %{commenter} ha reactivado una de sus notas' subject_other: '[OpenStreetMap] %{commenter} ha reactivado una nota que te interesa' your_note: '%{commenter} ha reactivado una de sus notas del mapa cerca de %{place}.' + your_note_html: '%{commenter} ha reactivado una de sus notas del mapa cerca + de %{place}.' commented_note: '%{commenter} ha reactivado una nota de mapa que ha comentado. La nota está cerca de %{place}.' + commented_note_html: '%{commenter} ha reactivado un nota del mapa en la que + usted ha comentado. La nota está cerca de %{place}.' details: Más detalles acerca de la nota pueden encontrarse en %{url}. + details_html: Puede encontrar más detalles acerca de la nota en %{url}. changeset_comment_notification: hi: Hola %{to_user}, greeting: Hola, @@ -1592,13 +1600,21 @@ es: que le interesa' your_changeset: '%{commenter} dejó un comentario el %{time} en uno de sus conjuntos de cambios' + your_changeset_html: '%{commenter} dejó un comentario el %{time} en uno de + sus conjuntos de cambios' commented_changeset: '%{commenter} dejó un comentario el %{time} en un conjunto de cambios que está siguiendo, creado por %{changeset_author}' + commented_changeset_html: '%{commenter} dejó un comentario el %{time} en un + conjunto de cambios que está siguiendo, creado por %{changeset_author}' partial_changeset_with_comment: con el comentario '%{changeset_comment}' + partial_changeset_with_comment_html: con el comentario '%{changeset_comment}' partial_changeset_without_comment: sin comentarios details: Puede encontrar más detalles sobre el conjunto de cambios en %{url}. + details_html: Puede encontrar más detalles sobre el conjunto de cambios en %{url}. unsubscribe: Para cancelar la suscripción a las actualizaciones de este conjunto de cambios, visite %{url} y haga clic en "Cancelar suscripción". + unsubscribe_html: Para darte de baja de las actualizaciones de este conjunto + de cambios, visita %{url} y haz clic en "darse de baja". messages: inbox: title: Buzón de entrada @@ -1676,6 +1692,24 @@ es: as_unread: Mensaje marcado como no leído destroy: destroyed: Mensaje borrado + shared: + markdown_help: + title_html: Analizado con kramdown + headings: Títulos + heading: Título + subheading: Subtítulo + unordered: Lista sin ordenar + ordered: Lista ordenada + first: Primer elemento + second: Segundo elemento + link: Enlace + text: Texto + image: Imagen + alt: Texto alternativo + url: URL + richtext_field: + edit: Editar + preview: Previsualizar site: about: next: Siguiente @@ -1857,17 +1891,6 @@ es: haga. Puede marcar sus ediciones como públicas desde su %{user_page}. user_page_link: página de usuario anon_edits_link_text: Descubra a que se debe - flash_player_required_html: Necesita un reproductor de Flash para usar Potlatch, - el editor Flash de OpenStreetMap. Puede descargar - un reproductor Flash desde Adobe.com. Otras - opciones también están disponibles para editar OpenStreetMap. - potlatch_unsaved_changes: Tiene cambios sin guardar. (Para guardarlos en Potlatch, - debería deseleccionar la vía o punto actual si está editando en directo, o - pulse sobre guardar si aparece un botón de guardar.) - potlatch2_not_configured: No se ha configurado Potlatch 2. Consulta https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 - para más información - potlatch2_unsaved_changes: Tiene cambios sin guardar. (Para guardar en Potlatch - 2, debe hacer clic en guardar). id_not_configured: iD no ha sido configurado no_iframe_support: Su navegador no soporta iframes HTML, que son necesarios para esta funcionalidad. @@ -1982,6 +2005,15 @@ es: url: https://wiki.openstreetmap.org/wiki/ES:Main_Page title: Wiki de OpenStreetMap description: Explora el wiki para obtener documentación detallada de OpenStreetMap. + potlatch: + removed: El editor de OpenStreetMap predeterminado se establece como Potlatch. + Dado que Adobe Flash Player se ha retirado, Potlatch ya no está disponible + para su uso en un navegador web. + desktop_html: Aún puede utilizarse Potlatch mediante la descarga + de la aplicación de escritorio para Mac y Windows. + id_html: Alternativamente, puede poner su editor predeterminado a iD, el que + se ejecuta en su navegador como hizo Potlatch anteriormente. Cambie + la configuración de usuario aquí. sidebar: search_results: Resultados de la búsqueda close: Cerrar diff --git a/config/locales/et.yml b/config/locales/et.yml index 9e3f14c0e..ed35ef13b 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -169,15 +169,9 @@ et: other: '%{count} aasta eest' editor: default: Vaikimisi (praegu %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (brauseripõhine redaktor) id: name: iD description: iD (brauseripõhine redaktor) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (brauseripõhine redaktor) remote: name: Kaugjuhtimine description: Kaugjuhtimine (JOSM või Merkaartor) @@ -383,13 +377,8 @@ et: new: title: Uus päeviku sissekanne form: - subject: 'Teema:' - body: 'Tekst:' - language: 'Keel:' - location: 'Asukoht:' - latitude: 'Laius:' - longitude: 'Pikkus:' - use_map_link: kasuta kaarti + location: Asukoht + use_map_link: Kasuta kaarti index: title: Kasutajate päevikud title_friends: Sõprade päevikud @@ -418,7 +407,7 @@ et: body: Kahjuks ei leidu päeviku sissekannet või kommentaari id-ga %{id}. Kontrolli sisestatud lingi õigekirja. Võimalik, et link, millele klõpsasid, on vigane. diary_entry: - posted_by_html: Postitas %{link_user} kuupäeval %{created} – %{language_link} + posted_by_html: Postitas %{link_user} kuupäeval %{created} – %{language_link}. comment_link: Kommenteeri seda sissekannet reply_link: Saada autorile sõnum comment_count: @@ -1003,13 +992,6 @@ et: et saaksid kasutamist hõlpsalt alustada. email_confirm: subject: '[OpenStreetMap] Kinnita oma e-posti aadress' - email_confirm_plain: - greeting: Tere! - hopefully_you: Keegi (loodetavasti sina) soovib muuta oma meiliaadressi asukohas - %{server_url} kujule %{new_address}. - click_the_link: Kui see oled sina, siis klõpsa palun alloleval lingil, et muudatus - kinnitada. - email_confirm_html: greeting: Tere! hopefully_you: Keegi (loodetavasti sina) soovib muuta oma meiliaadressi asukohas %{server_url} kujule %{new_address}. @@ -1017,13 +999,6 @@ et: kinnitada. lost_password: subject: '[OpenStreetMap] Parooli lähtestamise taotlus' - lost_password_plain: - greeting: Tere! - hopefully_you: Keegi (tõenäoliselt sina) on esitanud taotluse, et lähtestada - selle e-posti aadressiga openstreetmap.org-i konto parool. - click_the_link: Kui see oled sina, siis klõpsa palun alloleval lingil, et parool - lähtestada. - lost_password_html: greeting: Tere! hopefully_you: Keegi (tõenäoliselt sina) on esitanud taotluse, et lähtestada selle e-posti aadressiga openstreetmap.org-i konto parool. @@ -1146,6 +1121,22 @@ et: as_unread: Sõnum on märgitud lugemata sõnumiks. destroy: destroyed: Sõnum kustutatud. + shared: + markdown_help: + title_html: Parsitud kramdowniga + headings: Pealkirjad + heading: Pealkiri + subheading: Alampealkiri + unordered: Järjestamata loend + ordered: Järjestatud loend + first: Esimene üksus + second: Teine üksus + text: Tekst + image: Pilt + alt: Asendustekst + richtext_field: + edit: Muuda + preview: Eelvaade site: about: next: Edasi @@ -1342,18 +1333,6 @@ et: muuta oma muudatused avalikuks lehel %{user_page}. user_page_link: kasutajaleht anon_edits_link_text: Uuri välja, miks see on nii. - flash_player_required_html: Sa vajad Flashi esitajat, et kasutada Potlatchi, - OpenStreetMapi Flashi-põhist toimetit. Saad Flash - Playeri alla laadida saidilt Adobe.com. Selleks, et OpenStreetMapi redigeerida, - on olemas ka mitmeid - teisi võimalusi. - potlatch_unsaved_changes: Sul on salvestamata muudatusi. (Et salvestada Potlatchis - peaksid sa tühistama valitud joone või punkti kui sa redigeerid live-režiimis, - või kliki Salvesta nuppu, kui see on nähtaval.) - potlatch2_not_configured: Potlatch 2 pole häälestatud. Lisateavet vaata palun - asukohast https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 - potlatch2_unsaved_changes: Sul on salvestamata muudatusi. (Et salvestada programmis - Potlatch 2, peaksid klikkima Salvesta nuppu.) id_not_configured: iD ei ole seadistatud no_iframe_support: Sinu brauser ei toeta HTML-i funktsiooni "iframes", mis on vajalik selle režiimi toimimiseks. @@ -1545,15 +1524,15 @@ et: title_html: Parsitud kramdowniga headings: Pealkirjad heading: Pealkiri - subheading: Alapealkiri - unordered: Nummerdamata loetelu - ordered: Nummerdatud loetelu - first: Esimene kirje - second: Teine kirje + subheading: Alampealkiri + unordered: Järjestamata loend + ordered: Järjestatud loend + first: Esimene üksus + second: Teine üksus link: Link text: Tekst image: Pilt - alt: Alternatiivne tekst + alt: Asendustekst url: URL welcome: title: Tere tulemast! @@ -1893,7 +1872,7 @@ et: my comments: Minu kommentaarid oauth settings: OAuthi seaded blocks on me: Saadud blokeeringud - blocks by me: Minu antud blokeeringud + blocks by me: Minu seatud blokeeringud send message: Saada sõnum diary: Päevik edits: Muudatused @@ -1932,7 +1911,7 @@ et: administrator: Eemalda administraatori õigused moderator: Eemalda moderaatori õigused block_history: Aktiivsed blokeeringud - moderator_history: Antud blokeeringud + moderator_history: Seatud blokeeringud comments: Kommentaarid create_block: Blokeeri see kasutaja activate_user: Aktiveeri see kasutaja diff --git a/config/locales/eu.yml b/config/locales/eu.yml index dc5a72e2d..05cf15f86 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -129,15 +129,9 @@ eu: tagstring: koma mugatua editor: default: Lehenetsia (orain %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (nabigatzaile barneko editorea) id: name: iD description: iD (nabigatzaile barneko editorea) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (nabigatzaile barneko editorea) remote: name: Urrutiko agintea description: Urrutiko kontrola (JOSM edo Merkaartor) @@ -345,12 +339,7 @@ eu: new: title: Eguneroko Sarrera Berria form: - subject: 'Gaia:' - body: 'Testua:' - language: 'Hizkuntza:' location: 'Kokapena:' - latitude: 'Latitudea:' - longitude: 'Longitudea:' use_map_link: erabili mapa index: title: Erabiltzaileen egunerokoak @@ -1204,24 +1193,12 @@ eu: hasteko. email_confirm: subject: '[OpenStreetMap] Baieztatu zure eposta helbidea' - email_confirm_plain: - greeting: Kaixo, - hopefully_you: Norbaitek (zuk zorionez) zure helbide elektronikoa aldatu nahi - du %{server_url}en %{new_address}ra. - click_the_link: Hau zu bazara, beheko estekan klik egin aldaketa baieztatzeko. - email_confirm_html: greeting: Kaixo, hopefully_you: Norbaitek (zuk zorionez) zure helbide elektronikoa aldatu nahi du %{server_url}en %{new_address}ra. click_the_link: Hau zu bazara, beheko estekan klik egin aldaketa baieztatzeko. lost_password: subject: '[OpenStreetMap] Pasahitza berrezartzeko eskaera' - lost_password_plain: - greeting: Kaixo, - hopefully_you: Norbaitek (zuk posibleki) helbide elektroniko kontu honetara - openstreetmap.org berrezartzeko pasahitza eskatu du. - click_the_link: Hau zu bazara, egin klik beheko estekan zure pasahitza berrezartzeko. - lost_password_html: greeting: Kaixo, hopefully_you: Norbaitek (zuk posibleki) helbide elektroniko kontu honetara openstreetmap.org berrezartzeko pasahitza eskatu du. @@ -1520,18 +1497,6 @@ eu: Aldaketak publiko gisa ezar ditzakezu zure %{user_page}-tik. user_page_link: Lankide orria anon_edits_link_text: Aurkitu zergatik hau kasua den. - flash_player_required_html: Potlatch, OpenStreetMap Flash editorea erabiltzeko - Flash erreproduzitzailea behar duzu. download - Flash Player from Adobe.com Adobe Flash Player-tik deskargatu dezakezu - . Beste hainbat - aukera ere eskuragarri daude OpenStreetMap editatzeko. - potlatch_unsaved_changes: Aldaketak gorde gabe dituzu. (Potlatch-en gordetzeko, - uneko bidea edo puntuazioa desautatu beharko zenituzke, modu zuzenean editatzen - baduzu, edo egin klik gorde botoian.) - potlatch2_not_configured: Potlacth 2 ez da konfiguratu - mesedez ikusi https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 - informazio gehiagorako - potlatch2_unsaved_changes: Gorde gabeko aldaketak dituzu. (Potlatch 2 gordetzeko, - egin klik gorde botoian.) id_not_configured: iD-a ez da konfiguratu no_iframe_support: Zure nabigatzaileak ez ditu onartzen HTML iframe-ak, funtzio honetarako ezinbestekoak direnak. diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 63073ae7e..6685c79bf 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -2,6 +2,7 @@ # Exported from translatewiki.net # Export driver: phpyaml # Author: Abijeet Patro +# Author: Ahangarha # Author: Alirezaaa # Author: Amirsara # Author: Arash.pt @@ -203,15 +204,9 @@ fa: other: '%{count} سال پیش' editor: default: پیش‌فرض (در حال حاضر %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (ویرایشگر در مرورگر) id: name: iD description: iD (ویرایشگر در مرورگر) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (ویرایشگر در مرورگر) remote: name: کنترل از دور description: کنترل از دور (JOSM یا Merkaartor) @@ -437,12 +432,7 @@ fa: new: title: روزنوشت تازه form: - subject: 'موضوع:' - body: 'متن:' - language: 'زبان:' - location: 'مکان:' - latitude: 'عرض جغرافیایی:' - longitude: 'طول جغرافیایی:' + location: مکان use_map_link: استفاده از نقشه index: title: روزنوشت‌های کاربران @@ -472,7 +462,8 @@ fa: body: شوربختانه با شناسهٔ %{id} هیچ روزنوشت یا نظری یافت نشد. لطفاً نوشتار خود را بررسی کنید. همچنین ممکن است پیوندی که کلیک کرده‌اید اشتباه باشد. diary_entry: - posted_by_html: ارسالی از %{link_user} در %{created} به %{language_link} + posted_by_html: ارسالی از %{link_user} در %{created} به %{language_link}. + updated_at_html: آخرین به‌روزرسانی در %{updated}. comment_link: نظردادن به این روزنوشت reply_link: به نویسنده پیام بفرستید comment_count: @@ -558,6 +549,7 @@ fa: runway: باند فرودگاه taxiway: خزش‌راه terminal: پایانه + windsock: بادنمای کیسه‌ای amenity: animal_boarding: محل تحویل حیوانات animal_shelter: پناهگاه حیوانات @@ -731,6 +723,7 @@ fa: blacksmith: آهنگر brewery: ابجوسازی carpenter: نجار + confectionery: قنادی dressmaker: تولیدی لباس electrician: متخصص برق electronics_repair: تعمیر لوازم الکترنیکی @@ -891,7 +884,9 @@ fa: marina: لنگرگاه miniature_golf: گلف کوچک nature_reserve: طبیعت حفاظت شده + outdoor_seating: فضای نشستن خارجی park: پارک + picnic_table: میز پیکنیک pitch: زمین ورزشی playground: زمین بازی recreation_ground: زمین تفریحی @@ -914,6 +909,7 @@ fa: bridge: پل bunker_silo: پناهگاه chimney: دودکش + communications_tower: برج ارتباطی crane: جرثقیل dolphin: محل پهلوگیری dyke: خاکریز @@ -934,9 +930,11 @@ fa: silo: سیلو storage_tank: مخازن سیال surveillance: نظارت + telescope: تلسکوپ tower: برج wastewater_plant: کارخانه فاضلاب watermill: آسیاب آبی + water_tap: شیر آب water_tower: برج آب water_well: خوب water_works: مربوط به آب @@ -966,6 +964,7 @@ fa: grassland: سبزه‌زار heath: خارزار hill: تپه + hot_spring: چشمه آب گرم island: جزیره land: زمین marsh: مرداب @@ -989,20 +988,27 @@ fa: water: اب wetland: تالاب wood: جنگل + "yes": عارضه طبیعی office: accountant: حسابدار administrative: مدیریت + advertising_agency: آژانس تبلیغاتی architect: معمار association: اتحادیه company: شرکت + diplomatic: دفتر دیپلماتیک educational_institution: موسسه آموزشی employment_agency: آژانس کاریابی estate_agent: بنگاه املاک + financial: دفتر خدمات مالی government: اداره دولتی insurance: دفتر بیمه it: دفتر آی‌تی lawyer: وکیل + newspaper: دفتر روزنامه ngo: دفتر سازمان غیر دولتی + research: دفتر خدمات مشاوره‌ای + tax_advisor: مشاور مالیاتی telecommunication: دفتر مخابرات travel_agent: آژانس مسافرتی "yes": دفتر @@ -1074,6 +1080,7 @@ fa: car_repair: تعمیرگاه خودرو carpet: فروشگاه فرش charity: فروشگاه خیریه + cheese: پنیر فروشی chemist: شیمی‌دان clothes: فروشگاه پوشاک computer: فروشگاه رایانه @@ -1081,17 +1088,20 @@ fa: convenience: سوپرمارکت copyshop: مغازه فتوکپی cosmetics: فروشگاه لوازم آرایشی + dairy: فروشگاه لبنیات deli: اغذیه فروشی department_store: فروشگاه بزرگ discount: اقلام تخفیف فروشگاه doityourself: خودتان انجامش دهید dry_cleaning: تمیز کننده خشک + e-cigarette: فروشگاه سیگار الکترونیک electronics: فروشگاه الکترونیکی estate_agent: بنگاه املاک farm: فروشگاه مزرعه fashion: فروشگاه مد florist: گلفروشی food: فروشگاه مواد غذایی + frame: فروشگاه قاب funeral_directors: کارگردانان تشییع جنازه furniture: مبلمان garden_centre: مرکز باغ @@ -1144,6 +1154,8 @@ fa: vacant: فروشگاه خالی variety_store: فروشگاه اقلام گوناگون video: فروشگاه فیلم + video_games: فروشگاه بازی‌های ویدئویی + wholesale: فروشگاه عمده‌فروشی wine: فروشگاه شراب "yes": فروشگاه tourism: @@ -1195,9 +1207,11 @@ fa: level4: مرز استان level5: مرز شهرستان level6: مرز بخش + level7: مرز شهرداری level8: مرز روستا level9: مرز منطقه شهری level10: مرز ناحیه شهری + level11: محدوده محله types: cities: شهرها towns: شهرها @@ -1366,10 +1380,11 @@ fa: subject: '[OpenStreetMap] ‫%{user} روی روزنوشت نظر داد‬' hi: ‫سلام %{to_user}،‬ header: ‫%{from_user} روی روزنوشت اوپن‌استریت‌مپ با موضوع «%{subject}» نظر داد:‬ + header_html: '%{from_user} روی یادداشت روزانه اوپن‌استریت‌مپ نظری با موضوع %{subject} + گذاشته است:' footer: '‫همچنین می‌توانید نظر را در اینجا بخوانید: %{readurl}؛ اینجا به آن نظر دهید: %{commenturl}؛ یا از اینجا به نویسنده پیام بدهید: %{replyurl} ‬' message_notification: - subject_header: '[OpenStreetMap] %{subject}' hi: ‫سلام %{to_user}،‬ header: ‫%{from_user} از طریق اوپن‌استریت‌مپ پیامی با موضوع «%{subject}» برای شما فرستاده است:‬ @@ -1403,27 +1418,13 @@ fa: تا بتوانید شروع کنید.‬ email_confirm: subject: '[OpenStreetMap] نشانی ایمیل‌تان را تأیید کنید' - email_confirm_plain: greeting: سلام،‏ hopefully_you: ‫کسی (امیدواریم شما) می‌خواهد نشانی ایمیل خود در %{server_url} را به %{new_address} تغییر دهد.‬ click_the_link: ‫اگر خودتان هستید، لطفاً برای تأیید این تغییر روی پیوند زیر کلیک کنید.‬ - email_confirm_html: - greeting: سلام،‏ - hopefully_you: ‫کسی (امیدواریم شما) می‌خواهد نشانی ایمیل خود در %{server_url} - را به %{new_address} تغییر دهد.‬ - click_the_link: ‫اگر خودتان هستید، لطفاً برای تأیید تغییر روی پیوند زیر کلیک - کنید.‬ lost_password: subject: '[OpenStreetMap] درخواست بازنشانی گذرواژه' - lost_password_plain: - greeting: سلام،‏ - hopefully_you: ‫کسی (احتمالاً شما) درخواست کرده گذرواژهٔ مربوط به حساب کاربری - متناظر با این ایمیل در openstreetmap.org بازنشانی شود.‬ - click_the_link: ‫اگر خودتان درخواست کرده‌اید، لطفاً برای بازنشانی گذرواژه روی - پیوند زیر کلیک کنید.‬ - lost_password_html: greeting: سلام،‏ hopefully_you: ‫کسی (احتمالاً شما) درخواست کرده گذرواژهٔ مربوط به حساب کاربری متناظر با این ایمیل در openstreetmap.org بازنشانی شود.‬ @@ -1737,17 +1738,6 @@ fa: user_page_link: صفحهٔ کاربری anon_edits_html: (%{link}) anon_edits_link_text: بفهمید چرا این‌طور است. - flash_player_required_html: برای استفاده از Potlatch (ویرایشگر فلش OpenStreetMap) - به فلش‌پلیر نیاز دارید. می‌توانید فلش‌پلیر - را از Adobe.com دانلود کنید. چندین - گزینهٔ دیگر نیز برای ویرایش OpenStreetMap وجود دارد. - potlatch_unsaved_changes: شما تغییرات ذخیره‌نشده دارید. (برای ذخیره در Potlatch، - اگر در حالت زنده ویرایش می‌کنید، باید راه یا نقطهٔ جاری را از حالت انتخاب - درآورید، یا اگر دکمهٔ ذخیره را دارید روی آن کلیک کنید.) - potlatch2_not_configured: Potlatch 2 پیکربندی نشده - برای اطلاعات بیشتر https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 - را ببینید. - potlatch2_unsaved_changes: شما تغییرات ذخیره‌نشده دارید.(برای ذخیره در Potlatch - 2، شما باید روی ذخیره کلیک کنید.) id_not_configured: iD پیکربندی نشده است no_iframe_support: مرورگر شما فریم‌های HTML را، که برای این ویژگی لازم است، پشتیبانی نمی‌کند. diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 9d459e901..5664c31fe 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -15,6 +15,7 @@ # Author: Konstaduck # Author: Laurianttila # Author: Lliehu +# Author: Maantietäjä # Author: Macofe # Author: Markosu # Author: McSalama @@ -61,7 +62,7 @@ fi: message: create: Lähetä client_application: - create: Rekisteröidy + create: Rekisteröi update: Päivitä redaction: create: Luo redaktio @@ -116,8 +117,16 @@ fi: attributes: client_application: name: Nimi (pakollinen) + url: Pääsovelluksen URL-osoite (pakollinen) callback_url: Takaisinsoiton verkko-osoite support_url: Tuen osoite (URL) + allow_read_prefs: pääsyä käyttäjäasetuksiin + allow_write_prefs: muokata käyttäjäasetuksia + allow_write_diary: lisätä päiväkirjamerkintöjä, kommentteja ja kavereita + allow_write_api: muokata karttaa + allow_read_gpx: pääsyä yksityisiin GPS-jälkiin + allow_write_gpx: tallentaa GPS-jälkiä + allow_write_notes: muokata karttailmoituksia diary_comment: body: Leipäteksti diary_entry: @@ -172,7 +181,7 @@ fi: other: noin %{count} vuotta sitten almost_x_years: one: 1 vuosi sitten - other: lähes%{count} vuotta sitten + other: lähes %{count} vuotta sitten half_a_minute: puoli minuuttia sitten less_than_x_seconds: one: vähemmän kuin 1 sekuntia sitten @@ -200,15 +209,9 @@ fi: other: '%{count} vuotta sitten' editor: default: Oletus (tällä hetkellä %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (selainkäyttöinen muokkain) id: name: iD description: iD (selainkäyttöinen muokkain) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (selainkäyttöinen muokkain) remote: name: Kauko-ohjaus description: Kauko-ohjaus (JOSM tai Merkaartor) @@ -260,6 +263,12 @@ fi: anonymous: tuntematon no_comment: (ei kommenttia) part_of: Osana seuraavia + part_of_relations: + one: 1 relaatio + other: '%{count} relaatiota' + part_of_ways: + one: 1 viiva + other: '%{count} viivaa' download_xml: Lataa XML-tiedostona view_history: Näytä historia view_details: Näytä tiedot @@ -292,6 +301,9 @@ fi: title_html: 'Viiva: %{name}' history_title_html: Viivan %{name} historia nodes: Pisteet + nodes_count: + one: 1 piste + other: '%{count} pistettä' also_part_of_html: one: osana viivaa %{related_ways} other: osana viivoja %{related_ways} @@ -299,6 +311,9 @@ fi: title_html: 'Relaatio: %{name}' history_title_html: Relaation %{name} historia members: Jäsenet + members_count: + one: 1 jäsen + other: '%{count} jäsentä' relation_member: entry_role_html: '%{type} %{name} roolissa %{role}' type: @@ -309,6 +324,7 @@ fi: entry_html: Relaatio %{relation_name} entry_role_html: Relaatio %{relation_name} (rooli %{relation_role}) not_found: + title: Ei löytynyt sorry: 'Pahoittelemme, %{type} #%{id} ei pystytty löytämään.' type: node: Pistettä @@ -317,6 +333,7 @@ fi: changeset: muutoskokoelma note: merkintä timeout: + title: Aikakatkaisu sorry: Pahoittelut, tietojen hakeminen (kohde %{type}:%{id}) kesti liian kauan. type: node: piste @@ -387,7 +404,7 @@ fi: index: title: Muutoskokoelmat title_user: Käyttäjän %{user} muutoskokoelmat - title_friend: Kaverieni muutoskokoelmat + title_friend: Kaverien muutoskokoelmat title_nearby: Lähellä olevien käyttäjien muutoskokoelmat empty: Muutosryhmiä ei löytynyt. empty_area: Ei muutosryhmiä tällä alueella. @@ -415,13 +432,8 @@ fi: new: title: Uusi päiväkirjamerkintä form: - subject: 'Aihe:' - body: 'Teksti:' - language: 'Kieli:' - location: 'Sijainti:' - latitude: 'Leveyspiiri:' - longitude: 'Pituuspiiri:' - use_map_link: valitse kartalta + location: Sijainti + use_map_link: Käytä Karttaa index: title: Käyttäjien päiväkirjamerkinnät title_friends: Kaverien päiväkirjat @@ -450,7 +462,8 @@ fi: body: Tunnuksella %{id} ei ole päiväkirjamerkintää. Joko saamasi linkki oli virheellinen tai kirjoitit sen väärin. diary_entry: - posted_by_html: Käyttäjä %{link_user} kirjoitti tämän %{created} kielellä %{language_link} + posted_by_html: Käyttäjä %{link_user} kirjoitti tämän %{created} kielellä %{language_link}. + updated_at_html: Päivitetty viimeksi %{updated}. comment_link: Kommentoi tätä kirjoitusta reply_link: Lähetä viesti tekijälle comment_count: @@ -525,6 +538,7 @@ fi: pylon: Pylväs station: Ilmarata-asema t-bar: Ankkurihissi + "yes": Ilmarata aeroway: aerodrome: Lentokenttä airstrip: Kiitorata @@ -533,8 +547,10 @@ fi: hangar: Hangaari helipad: Helikopterikenttä holding_position: Odotuspaikka + navigationaid: Ilmailunavigointituki parking_position: Parkkialue runway: Kiitorata + taxilane: Taksikaista taxiway: Rullaustie terminal: Terminaali windsock: Tuulipussi @@ -548,7 +564,9 @@ fi: bench: Penkki bicycle_parking: Pyöräparkki bicycle_rental: Pyörävuokraamo + bicycle_repair_station: Pyöränkorjauspiste biergarten: Terassi + blood_bank: Veripalvelu boat_rental: Venevuokraamo brothel: Bordelli bureau_de_change: Rahanvaihto @@ -565,6 +583,7 @@ fi: clock: Kello college: Oppilaitos community_centre: Yhteisökeskus + conference_centre: Konferenssikeskus courthouse: Oikeustalo crematorium: Krematorio dentist: Hammaslääkäri @@ -572,6 +591,7 @@ fi: drinking_water: Juomavesi driving_school: Autokoulu embassy: Lähetystö + events_venue: Tapahtumakeskus fast_food: Pikaruokaravintola ferry_terminal: Lauttaterminaali fire_station: Paloasema @@ -588,6 +608,8 @@ fi: kindergarten: Päiväkoti language_school: Kielikoulu library: Kirjasto + loading_dock: Lastauslaituri + love_hotel: Rakkaushotelli marketplace: Tori monastery: Luostari money_transfer: Rahansiirto @@ -598,6 +620,7 @@ fi: parking: Parkkipaikka parking_entrance: Pysäköintialueen sisäänkäynti parking_space: Parkkipaikka + payment_terminal: Maksupääte pharmacy: Apteekki place_of_worship: Kirkko, temppeli, pyhä paikka police: Poliisi @@ -605,6 +628,8 @@ fi: post_office: Postitoimisto prison: Vankila pub: Pubi + public_bath: Uimahalli + public_bookcase: Julkinen kirjahylly public_building: Julkinen rakennus recycling: Kierrätyspaikka restaurant: Ravintola @@ -1289,7 +1314,7 @@ fi: footer: Lue kommentti sivulla %{readurl}. Jatkokommentin voi lähettää sivulla %{commenturl} tai lähettää viestin tekijälle sivulla %{replyurl}. message_notification: - subject_header: '[OpenStreetMap] %{subject}' + subject: '[OpenStreetMap] %{message_title}' hi: Hei %{to_user}! header: '%{from_user} on lähettänyt sinulle viestin OpenStreetMapissa otsikkolla %{subject}:' @@ -1300,11 +1325,15 @@ fi: subject: '[OpenStreetMap] %{user} lisäsi sinut kaverikseen' had_added_you: Käyttäjä %{user} lisäsi sinut kaverikseen OpenStreetMapissa. see_their_profile: Voit tutustua hänen käyttäjäsivuunsa osoitteessa %{userurl}. + see_their_profile_html: Tutustu hänen käyttäjäsivuunsa osoitteessa %{userurl}. befriend_them: Voit myös lisätä lähettäjän kaveriksi osoitteessa %{befriendurl}. + befriend_them_html: Voit myös lisätä lähettäjän kaveriksi osoitteessa %{befriendurl}. gpx_failure: + hi: Hei %{to_user}! failed_to_import: 'epäonnistui tuoda. Tässä virhe:' subject: '[OpenStreetMap] GPX-tuonti epäonnistui' gpx_success: + hi: Hei %{to_user}! loaded_successfully: one: '%{trace_points} pistettä mahdollisesta 1 pisteestä ladattu onnistuneesti.' other: ' {trace_points} pistettä mahdollisista %{possible_points} ladattu @@ -1320,29 +1349,16 @@ fi: asioita, jotta pääset alkuun. email_confirm: subject: '[OpenStreetMap] Vahvista sähköpostiosoitteesi' - email_confirm_plain: greeting: Hei, hopefully_you: Joku (toivottavasti sinä) haluaa vaihtaa sähköpostiosoitteen palvelimella %{server_url} osoitteeksi %{new_address} click_the_link: Jos tämä olet sinä, napsauta linkkiä alla vahvistaaksesi muutoksen. - email_confirm_html: - greeting: Hei, - hopefully_you: Joku (toivottavasti sinä) tahtoo muuttaa sähköpostiosoitteensa - sivulla %{server_url} osoitteeksi %{new_address}. - click_the_link: Jos tämä olet sinä, napsauta linkkiä alla vahvistaaksesi muutoksen. lost_password: subject: '[OpenStreetMap] Salasanan vaihtopyyntö' - lost_password_plain: - greeting: Hei! + greeting: Hei, hopefully_you: Joku (mahdollisesti sinä) on pyytänyt tähän sähköpostiosoitteeseen rekisteröidyn openstreetmap.org-tunnuksen salasanan vaihtoa. click_the_link: Jos tämä olet sinä, napsauta linkkiä alla nollataksesi salasanasi. - lost_password_html: - greeting: Hei, - hopefully_you: Tähän sähköpostiosoitteeseen linkitetyn OpenStreetMap.org-käyttäjätilin - salasanaa on pyydetty vaihdettavan. - click_the_link: Jos olet pyytänyt uutta salasanaa, palauta salasanasi napsauttamalla - alapuolella olevaa linkkiä. note_comment_notification: anonymous: Tuntematon käyttäjä greeting: Hei! @@ -1352,26 +1368,39 @@ fi: merkintää' your_note: '%{commenter} on kommentoinut yhtä merkinnöistäsi lähellä paikkaa %{place}.' + your_note_html: '%{commenter} on kommentoinut karttailmoitustasi lähellä paikkaa + %{place}.' commented_note: '%{commenter} on kommentoinut yhtä kommentoimaasi merkintää. Merkintä on lähellä paikkaa %{place}.' + commented_note_html: '%{commenter} on kommentoinut kommentoimaasi karttailmoitusta, + joka on lähellä paikkaa %{place}.' closed: subject_own: '[OpenStreetMap] %{commenter} on ratkaissut karttailmoituksesi' subject_other: '[OpenStreetMap] %{commenter} on ratkaissut sinua kiinnostavan karttailmoituksen' your_note: '%{commenter} on ratkaissut lähettämäsi karttailmoituksen lähellä paikkaa %{place}.' + your_note_html: '%{commenter} on ratkaissut lähettämäsi karttailmoituksen + lähellä paikkaa %{place}.' commented_note: '%{commenter} on ratkaissut karttailmoituksen, jota olet kommentoinut. Merkintä on lähellä paikkaa %{place}.' + commented_note_html: '%{commenter} on ratkaissut kommentoimasi karttailmoituksen + lähellä paikkaa %{place}.' reopened: subject_own: '[OpenStreetMap] %{commenter} on avannut karttamerkintäsi uudelleen' subject_other: '[OpenStreetMap] %{commenter} on avannut karttailmoituksen uudelleen' your_note: '%{commenter} on avannut karttamerkinnän uudelleen lähellä paikkaa %{place}.' + your_note_html: '%{commenter} on avannut karttamerkintäsi lähellä paikkaa + %{place} uudelleen.' commented_note: '%{commenter} on aktivoinut karttailmoituksen uudelleen. Tämä viesti lähetetään siksi, että olet kommentoinut tätä karttailmoitusta, joka on lähellä paikkaa %{place}.' + commented_note_html: '%{commenter} on aktivoinut kommentoimasi karttailmoituksen + lähellä paikkaa %{place} uudelleen.' details: Lisätietoja merkinnästä löytyy osoitteesta %{url}. + details_html: Lisätietoja karttailmoituksesta löytyy osoitteesta %{url}. changeset_comment_notification: hi: Hei %{to_user}! greeting: Hei, @@ -1380,13 +1409,20 @@ fi: subject_other: '[OpenStreetMap] %{commenter} on kommentoinut sinua kiinnostavaa muutoskokoelmaa' your_changeset: '%{commenter} kommentoi %{time} muutoskokoelmaasi' + your_changeset_html: '%{commenter} kommentoi muutoskokoelmaasi %{time}' commented_changeset: '%{commenter} jätti %{time} kommentin kartan muutoskokoelmaan jota katselet jonka on luonut %{changeset_author}' + commented_changeset_html: '%{commenter} kommentoi %{time} tarkastelemaasi + muutoskokoelmaa, jonka muokkaaja on %{changeset_author}' partial_changeset_with_comment: 'seuraavasti: "%{changeset_comment}"' + partial_changeset_with_comment_html: 'seuraavasti: "%{changeset_comment}"' partial_changeset_without_comment: ei kommenttia details: 'Lisätietoja muutoskokoelmasta: %{url}' + details_html: 'Lisätietoja muutoskokoelmasta: %{url}' unsubscribe: Peru tämän muutoskokoelman sähköposti-ilmoitukset siirtymällä osoitteeseen %{url} ja napsauttamalla Lopeta tilaus. + unsubscribe_html: Peru tämän muutoskokoelman sähköposti-ilmoitukset siirtymällä + osoitteeseen %{url} ja napsauttamalla Lopeta tilaus. messages: inbox: title: Saapuneet @@ -1461,6 +1497,24 @@ fi: as_unread: Viesti on merkitty lukemattomaksi. destroy: destroyed: Viesti on poistettu. + shared: + markdown_help: + title_html: Jäsennä Wikitekstinä + headings: Otsikot + heading: Otsikko + subheading: Alaotsikko + unordered: Järjestämätön luettelo + ordered: Järjestetty luettelo + first: Ensimmäinen tuote + second: Toinen kohta + link: Linkki + text: Teksti + image: Kuva + alt: Vaihtoehtoinen teksti + url: URL + richtext_field: + edit: Muokkaa + preview: Esikatsele site: about: next: Seuraava @@ -1632,17 +1686,6 @@ fi: muokkauksesi julkisiksi. Voit vaihtaa asetuksen %{user_page}-sivulta. user_page_link: käyttäjätiedot anon_edits_link_text: Perustelut (englanniksi) julkisuusvaatimukselle. - flash_player_required_html: Potlatch-karttamuokkausohjelman käyttö edellyttää - Flash Player -lisäosan asentamista. Lataa Flash Player sitä ylläpitävän Adoben verkkosivuilta. Karttaa - voi muokata myös muilla - ohjelmistoilla. - potlatch_unsaved_changes: Tallentamattomia muutoksia. Tallenna muutokset Potlatchissa - poistamalla valinta nykyiseltä karttakohteelta tai napsauta Tallenna-painiketta, - jos sellainen on käytössä. - potlatch2_not_configured: Potlatch 2 ei ole määritetty - Katso lisätietoja https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 - potlatch2_unsaved_changes: Karttaan on tehty tallentamattomia muutoksia. Tallenna - muokkaukset Potlatch 2:ssa napsauttamalla Tallenna-painiketta. id_not_configured: iD-ohjelmaa ei ole asetettu no_iframe_support: Käytössä oleva selain ei tue HTML-kehyksiä, joka vaaditaan tämän toiminnon käyttämiseen. @@ -1751,6 +1794,14 @@ fi: title: OpenStreetMap-wiki description: Tutustu syvällisemmin OpenStreetMapiin wikikirjastossa. Osittain englanninkielinen. + potlatch: + removed: OpenStreetMapin oletusmuokkausohjelmaksi on valittu Potlatch. Adoben + Flash Player -lisäosan tuki on päättynyt, minkä vuoksi Potlatch ei ole enää + saatavilla verkkoselaimessa. + desktop_html: Potlatchia voi yhä käyttää Mac- + ja PC-ohjelmalla. + id_html: Vaihtoehtoisesti voit siirtyä iD-ohjelman käyttöön, joka toimii verkkoselaimessa. + Muuta käyttäjäasetuksiasi. sidebar: search_results: Hakutulokset close: Sulje @@ -2034,11 +2085,11 @@ fi: allow_to: 'Salli asiakassovelluksen:' allow_read_prefs: lukea käyttäjäsi asetuksia allow_write_prefs: muokata käyttäjäsi asetuksia - allow_write_diary: kirjoita päiväkirjamerkintöjä, kommentoi ja löydä ystäviä. + allow_write_diary: kirjoita päiväkirjamerkintöjä, kommentoi ja löydä kavereita. allow_write_api: muokata karttaa allow_read_gpx: lukea yksityisiä GPS-jälkiäsi allow_write_gpx: tallenna GPS-jälkiä. - allow_write_notes: Muokkaa muistiinpanoja. + allow_write_notes: Muokkaa karttailmoituksia. grant_access: Myönnä oikeudet authorize_success: title: Valtuutuspyyntö hyväksytty @@ -2084,7 +2135,7 @@ fi: registered_apps: 'Seuraavat sovellukset käyttävät käyttäjätunnustasi:' register_new: Rekisteröi sovelluksesi form: - requests: 'Sovellus pyytää käyttäjältä seuraavia tietoja:' + requests: 'Sovellus pyytää lupaa:' not_found: sorry: Valitettavasti tyyppiä %{type} ei löydy. create: @@ -2250,7 +2301,7 @@ fi: notes: Karttailmoitukset remove as friend: Poista kavereista add as friend: Lisää kaveriksi - mapper since: 'Rekisteröitymispäivämäärä:' + mapper since: 'Rekisteröitynyt:' ct status: 'Osallistumisehdot:' ct undecided: Ei valittu ct declined: Hylätty @@ -2264,7 +2315,7 @@ fi: if_set_location_html: Määrittelet sijaintisi sivulla %{settings_link} nähdäksesi lähialueen käyttäjiä. settings_link_text: asetussivulla - my friends: Ystäväni + my friends: Kaverit no friends: Sinulla ei ole vielä kavereita. km away: '%{count} kilometrin päässä' m away: '%{count} metrin päässä' diff --git a/config/locales/fit.yml b/config/locales/fit.yml index a2bb85107..9d87db1f1 100644 --- a/config/locales/fit.yml +++ b/config/locales/fit.yml @@ -149,15 +149,9 @@ fit: other: '%{count} vuotta sitten' editor: default: Oletus (tällä hetkellä %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (selainkäyttöinen mookkain) id: name: iD description: iD (selainkäyttöinen mookkain) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (selainkäyttöinen mookkain) remote: name: Kauko-ohjaus description: Kauko-ohjaus (JOSM eli Merkaartor) @@ -358,12 +352,7 @@ fit: new: title: Uusi päiväkirjamerkintä form: - subject: 'Aihe:' - body: 'Teksti:' - language: 'Kieli:' location: 'Paikka:' - latitude: 'Leveyspiiri:' - longitude: 'Pituuspiiri:' use_map_link: valitte kartalta index: title: Käyttäjitten päiväkirjamerkinnät @@ -642,19 +631,11 @@ fit: asioita, jotta pääset alkuun. email_confirm: subject: '[OpenStreetMap] Vahvista e-postiatressi' - email_confirm_plain: greeting: Hei, hopefully_you: Joku (toivottavasti sinä) haluaa vaihtaa e-postiatressin palvelimella %{server_url} atressiksi %{new_address} click_the_link: Jos tämä olet sinä, knapauta länkkiä alla vahvistaaksesi muutoksen. - email_confirm_html: - greeting: Hei, - hopefully_you: Joku (toivottavasti sinä) tahtoo muuttaa e-postiatressinsa sivula - %{server_url} atressiksi %{new_address}. - click_the_link: Jos tämä olet sinä, knapauta länkkiä alla vahvistaaksesi muutoksen. - lost_password_plain: - greeting: Hei, - lost_password_html: + lost_password: greeting: Hei, note_comment_notification: anonymous: Tuntematon käyttäjä diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 681aaa6e3..343256a3a 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -246,18 +246,12 @@ fr: with_name_html: '%{name} (%{id})' editor: default: Par défaut (actuellement %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (éditeur intégré au navigateur) id: name: iD description: iD (éditeur intégré au navigateur) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (éditeur intégré au navigateur) remote: name: Éditeur externe - description: Éditeur externe (JOSM ou Merkaartor) + description: Éditeur externe (JOSM, Porlatch, Merkaartor) auth: providers: none: Aucun @@ -419,13 +413,13 @@ fr: hidden_title: Note masquée nº %{note_name} opened_by_html: Créée par %{user}, %{when} opened_by_anonymous_html: Créée par un utilisateur anonyme, %{when} - commented_by_html: Commenté par %{user} %{when} - commented_by_anonymous_html: Commenté par un utilisateur anonyme %{when} - closed_by_html: Résolu par %{user} %{when} - closed_by_anonymous_html: Résolu par un utilisateur anonyme le %{when} + commented_by_html: Commentée par %{user}, %{when} + commented_by_anonymous_html: Commentée par un utilisateur anonyme, %{when} + closed_by_html: Résolue par %{user}, %{when} + closed_by_anonymous_html: Résolue par un utilisateur anonyme, %{when} reopened_by_html: Réactivée par %{user}, %{when} - reopened_by_anonymous_html: Réactivé par un utilisateur anonyme %{when} - hidden_by_html: Masqué par %{user} %{when} + reopened_by_anonymous_html: Réactivée par un utilisateur anonyme, %{when} + hidden_by_html: Masquée par %{user}, %{when} report: Signaler cette note coordinates_html: '%{latitude}, %{longitude}' query: @@ -481,13 +475,8 @@ fr: new: title: Nouvelle entrée du journal form: - subject: 'Sujet :' - body: 'Corps :' - language: 'Langue :' - location: 'Lieu :' - latitude: 'Latitude :' - longitude: 'Longitude :' - use_map_link: utiliser la carte + location: Lieu + use_map_link: Utiliser la carte index: title: Journaux des utilisateurs title_friends: Journaux des amis @@ -662,7 +651,7 @@ fr: hunting_stand: Stand de tir ice_cream: Glacier internet_cafe: Cybercafé - kindergarten: Jardin d’enfant + kindergarten: École maternelle language_school: École de langue library: Bibliothèque loading_dock: Quai de chargement @@ -728,7 +717,7 @@ fr: "yes": Frontière bridge: aqueduct: Aqueduc - boardwalk: Promenade + boardwalk: Passerelle en bois / caillebotis suspension: Pont suspendu swing: Pont tournant viaduct: Viaduc @@ -760,7 +749,7 @@ fr: houseboat: Habitation flottante hut: Cahute industrial: Bâtiment industriel - kindergarten: Bâtiment de jardin d’enfant + kindergarten: Bâtiment d’école maternelle manufacture: Bâtiment d’usine office: Bâtiment de bureaux public: Bâtiment public @@ -992,7 +981,7 @@ fr: breakwater: Brise-lames bridge: Pont bunker_silo: Bunker - cairn: Cairn + cairn: Tumulus chimney: Cheminée clearcut: Déboisement communications_tower: Tour de communication @@ -1022,12 +1011,12 @@ fr: storage_tank: Citerne de stockage street_cabinet: Armoire de rue surveillance: Dispositif / caméra de surveillance - telescope: Téléscope + telescope: Télescope tower: Tour utility_pole: Poteau utilitaire wastewater_plant: Station de traitement des eaux usées watermill: Moulin à eau - water_tap: Robinet d'eau + water_tap: Robinet d’eau water_tower: Château d’eau water_well: Puits water_works: Système hydraulique @@ -1097,12 +1086,12 @@ fr: employment_agency: Agence pour l’emploi energy_supplier: Agence de fournisseur d’électricité estate_agent: Agent immobilier - financial: Bureau de finance + financial: Bureau financier government: Administration publique insurance: Agence d’assurance it: Bureau informatique lawyer: Avocat - logistics: Agence de logistique + logistics: Agence logistique newspaper: Agence de journal ngo: Agence d’une ONG notary: Notaire @@ -1189,7 +1178,7 @@ fr: charity: Boutique humanitaire cheese: Fromager chemist: Droguerie - chocolate: Chocolat + chocolate: Chocolatier clothes: Boutique de vêtements coffee: Magasin de café computer: Boutique informatique @@ -1209,10 +1198,10 @@ fr: electronics: Boutique de produits électroniques erotic: Boutique érotique estate_agent: Agent immobilier - fabric: Magasin de tissu + fabric: Boutique de tissus farm: Magasin de produits agricoles fashion: Boutique de mode - fishing: Magasin de fournitures de pêche + fishing: Magasin d’accessoires de pêche florist: Fleuriste food: Magasin d’alimentation frame: Magasin de cadres @@ -1241,11 +1230,11 @@ fr: lottery: Loterie mall: Centre commercial massage: Massage - medical_supply: Magasin d'appareils médicaux + medical_supply: Magasin d’appareils médicaux mobile_phone: Boutique de téléphones mobiles - money_lender: Prêts d'argent + money_lender: Prêts d’argent motorcycle: Magasin de motos - motorcycle_repair: Magasin de réparation de moto + motorcycle_repair: Réparateur de moto music: Boutique de musique / disquaire musical_instrument: Instruments de musique newsagent: Marchand de journaux @@ -1258,7 +1247,7 @@ fr: pawnbroker: Prêteur sur gages perfumery: Parfumerie pet: Animalerie - pet_grooming: Soin des animaux + pet_grooming: Soin des animaux domestiques photo: Boutique de photographie seafood: Fruits de mer second_hand: Boutique de produits d’occasion @@ -1266,7 +1255,7 @@ fr: shoes: Magasin de chaussures sports: Magasin de d’articles de sport stationery: Papeterie - storage_rental: Garde-meuble + storage_rental: Garde-meubles supermarket: Supermarché tailor: Tailleur tattoo: Tatoueur @@ -1331,18 +1320,18 @@ fr: "yes": Cours d’eau admin_levels: level2: Frontière de pays - level3: Limite de région + level3: Frontière de région level4: Limite d’État, province ou région level5: Limite de région level6: Limite de département ou province - level7: Limite d'arrondissement + level7: Frontière municipale level8: Limite communale level9: Limite de village ou arrondissement municipal level10: Limite de quartier - level11: Limite de voisinage + level11: Frontière de voisinage types: - cities: Villes - towns: Villages + cities: Grandes villes + towns: Petites villes places: Lieux results: no_results: Aucun résultat n’a été trouvé @@ -1356,7 +1345,7 @@ fr: reported_user: Utilisateur signalé not_updated: Non mis à jour search: Rechercher - search_guidance: 'Problèmes de recherche :' + search_guidance: 'Problèmes de recherche :' user_not_found: L’utilisateur n’existe pas issues_not_found: Aucun problème trouvé de ce type status: État @@ -1379,7 +1368,7 @@ fr: successful_update: Votre rapport a bien été mis à jour provide_details: Veuillez fournir les détails demandés show: - title: Problème %{status} nº %{issue_id} + title: Problème %{status} nº %{issue_id} reports: zero: Aucun rapport one: 1 rapport @@ -1397,20 +1386,20 @@ fr: no_other_issues: Aucun autre problème avec cet utilisateur. comments_on_this_issue: Commentaires sur ce problème resolve: - resolved: L’état du problème a été mis à « Résolu » + resolved: L’état du problème a été mis à « Résolu » ignore: - ignored: L’état du problème a été mis à « Ignoré » + ignored: L’état du problème a été mis à « Ignoré » reopen: - reopened: L’état du problème a été mis à « Ouvert » + reopened: L’état du problème a été mis à « Ouvert » comments: comment_from_html: Commentaire de %{user_link} sur %{comment_created_at} - reassign_param: Réaffecter le problème ? + reassign_param: Réaffecter le problème ? reports: reported_by_html: Signalé comme %{category} par %{user} le %{updated_at} helper: reportable_title: - diary_comment: '%{entry_title}, commentaire nº %{comment_id}' - note: Note nº %{note_id} + diary_comment: '%{entry_title}, commentaire nº %{comment_id}' + note: Note nº %{note_id} issue_comments: create: comment_created: Votre commentaire a bien été créé @@ -1420,7 +1409,7 @@ fr: missing_params: Impossible de créer un nouveau rapport disclaimer: intro: 'Avant d’envoyer votre rapport aux modérateurs du site, veuillez vous - assurer que :' + assurer que :' not_just_mistake: Vous êtes certain que le problème n’est pas juste une erreur unable_to_fix: Vous ne pouvez pas régler le problème par vous-même ou avec l’aide des membres de votre proche communauté @@ -1473,7 +1462,7 @@ fr: user_diaries_tooltip: Voir les journaux d’utilisateurs edit_with: Modifier avec %{editor} tag_line: La carte wiki libre du monde - intro_header: Bienvenue dans OpenStreetMap ! + intro_header: Bienvenue dans OpenStreetMap ! intro_text: OpenStreetMap est une carte du monde, créée par des gens comme vous et libre d’utilisation sous licence libre. intro_2_create_account: Créez un compte d’utilisateur @@ -1507,73 +1496,69 @@ fr: journal' hi: Bonjour %{to_user}, header: '%{from_user} a publié un commentaire sur un article récent du journal - OpenStreetMap avec le sujet %{subject} :' + OpenStreetMap avec le sujet %{subject} :' + header_html: '%{from_user} a commenté sur l’entrée d’agenda de OpenStreetMap + avec le sujet %{subject} :' footer: Vous pouvez également lire le commentaire sur %{readurl}, le commenter sur %{commenturl} ou envoyer un message à l'auteur sur %{replyurl} + footer_html: Vous pouvez aussi lire le commentaire sur %{readurl} et vous pouvez + commenter sur %{commenturl} ou envoyer un message à l’auteur sur %{replyurl} message_notification: - subject_header: '[OpenStreetMap] %{subject}' + subject: '[OpenStreetMap] %{message_title}' hi: Bonjour %{to_user}, - header: '%{from_user} vous a envoyé un message depuis OpenStreetMap avec le - sujet %{subject} :' + header: '%{from_user} vous a envoyé un message par OpenStreetMap avec le sujet + %{subject} :' + header_html: '%{from_user} vous a envoyé un message via OpenStreetMap avec le + sujet %{subject} :' + footer: Vous pouvez aussi lire le message sur %{readurl} et envoyer un message + à l’auteur sur %{replyurl} footer_html: Vous pouvez aussi lire le message sur %{readurl} ou envoyer un message à l'auteur sur %{replyurl} friendship_notification: hi: Bonjour %{to_user}, subject: '[OpenStreetMap] %{user} vous a ajouté comme ami' had_added_you: '%{user} vous a ajouté comme ami dans OpenStreetMap.' - see_their_profile: 'Vous pouvez voir son profil ici : %{userurl}.' - befriend_them: 'Vous pouvez également l''ajouter comme ami ici : %{befriendurl}.' + see_their_profile: 'Vous pouvez voir son profil ici : %{userurl}.' + see_their_profile_html: Vous pouvez voir leur profil sur %{userurl}. + befriend_them: 'Vous pouvez également l’ajouter comme ami(e) ici : %{befriendurl}.' + befriend_them_html: Vous pouvez aussi les ajouter comme amis sur %{befriendurl}. gpx_description: - description_with_tags_html: 'Il ressemble à votre fichier GPX %{trace_name} - avec la description %{trace_description} et les balises suivantes : %{tags}' + description_with_tags_html: 'Cela ressemble à votre fichier GPX %{trace_name} + avec la description %{trace_description} et les balises suivantes : %{tags}' description_with_no_tags_html: Cela ressemble à votre fichier GPX %{trace_name} avec la description %{trace_description} et sans balises gpx_failure: hi: Bonjour %{to_user}, - failed_to_import: 'n’a pas pu être importé. Voici l’erreur :' - more_info_html: Vous trouverez plus d'informations sur les échecs d'importation - GPX et comment les éviter à l'adresse %{url}. + failed_to_import: 'n’a pas pu être importé. Voici l’erreur :' + more_info_html: Vous trouverez plus d’informations sur les échecs d’import GPX + et comment les éviter à l’adresse %{url}. import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures subject: '[OpenStreetMap] Échec de l’import GPX' gpx_success: hi: Bonjour %{to_user}, loaded_successfully: - one: s’est chargé correctement avec %{trace_points} du point possible. + one: s’est chargé correctement avec %{trace_points} du seul point possible. other: s’est chargé correctement avec %{trace_points} des %{possible_points} points possibles. subject: '[OpenStreetMap] Import GPX réussi' signup_confirm: subject: '[OpenStreetMap] Bienvenue dans OpenStreetMap' - greeting: Bonjour ! + greeting: Bonjour ! created: Quelqu’un (vous, espérons-le) vient juste de créer un compte sur %{site_url}. confirm: 'Avant que nous fassions quoi que ce soit d’autre, nous avons besoin - d’une confirmation que cette demande provient bien de vous ; si c’est le cas, - veuillez cliquer le lien ci-dessous pour confirmer votre compte :' + d’une confirmation que cette demande provient bien de vous ; si c’est le cas, + veuillez cliquer le lien ci-dessous pour confirmer votre compte :' welcome: Une fois votre compte confirmé, nous vous fournirons des informations supplémentaires pour bien démarrer. email_confirm: subject: '[OpenStreetMap] Confirmation de votre adresse de courriel' - email_confirm_plain: greeting: Bonjour, hopefully_you: Quelqu’un (vous, espérons-le) aimerait modifier son adresse de courriel sur %{server_url} en %{new_address}. click_the_link: Si vous êtes à l’origine de cette demande, cliquez le lien ci-dessous pour confirmer cette modification. - email_confirm_html: - greeting: Bonjour, - hopefully_you: Quelqu’un (vous, espérons-le) aimerait changer son adresse de - courriel de %{server_url} en %{new_address}. - click_the_link: Si vous êtes à l’origine de cette demande, cliquez le lien ci-dessous - pour confirmer cette modification. lost_password: subject: '[OpenStreetMap] Demande de réinitialisation du mot de passe' - lost_password_plain: - greeting: Bonjour, - hopefully_you: Quelqu’un (vous, espérons-le) a demandé la réinitialisation du - mot de passe du compte openstreetmap.org associé à cette adresse de courriel. - click_the_link: Si vous êtes à l’origine de cette demande, cliquez le lien ci-dessous - pour réinitialiser votre mot de passe. - lost_password_html: greeting: Bonjour, hopefully_you: Quelqu’un (vous, espérons-le) a demandé la réinitialisation du mot de passe du compte openstreetmap.org associé à cette adresse de courriel. @@ -1588,23 +1573,35 @@ fr: vous vous intéressez' your_note: '%{commenter} a laissé un commentaire sur une de vos notes de carte près de %{place}.' + your_note_html: '%{commenter} a laissé un commentaire sur une de vos notes + de carte près de %{place}.' commented_note: '%{commenter} a laissé un commentaire sur une note de carte que vous avez commentée. La note est proche de %{place}.' + commented_note_html: '%{commenter} a laissé un commentaire sur une note de + carte que vous avez commentée. La note est proche de %{place}.' closed: subject_own: '[OpenStreetMap] %{commenter} a résolu une de vos notes' subject_other: '[OpenStreetMap] %{commenter} a résolu une note à laquelle vous vous intéressez' your_note: '%{commenter} a résolu une de vos notes de carte près de %{place}.' + your_note_html: '%{commenter} a résolu une de vos notes de carte près de %{place}.' commented_note: '%{commenter} a résolu une note de carte que vous avez commentée. La note est proche de %{place}.' + commented_note_html: '%{commenter} a résolu une note de carte que vous avez + commentée. La note est près de %{place}.' reopened: subject_own: '[OpenStreetMap] %{commenter} a réactivé une de vos notes' subject_other: '[OpenStreetMap] %{commenter} a réactivé une note à laquelle vous vous intéressez' your_note: '%{commenter} a réactivé une de vos notes de carte près de %{place}.' + your_note_html: '%{commenter} a réactivé une de vos notes de carte près de + %{place}.' commented_note: '%{commenter} a réactivé une note de carte que vous avez commentée. La note se trouve près de %{place}.' + commented_note_html: '%{commenter} a réactivé une note de carte que vous avez + commentée. La note est près de %{place}.' details: Plus de détails concernant la note se trouvent à %{url}. + details_html: Plus de détails concernant la note se trouvent à %{url}. changeset_comment_notification: hi: Bonjour %{to_user}, greeting: Bonjour, @@ -1615,13 +1612,22 @@ fr: auquel vous vous intéressez' your_changeset: '%{commenter} a laissé un commentaire le %{time} sur un de vos ensembles de changements' + your_changeset_html: '%{commenter} a laissé un commentaire à %{time} sur un + de vos ensembles de modifications' commented_changeset: '%{commenter} a laissé un commentaire le %{time} sur un ensemble de changements créé par %{changeset_author} et que vous suivez' - partial_changeset_with_comment: avec le commentaire « %{changeset_comment}' » + commented_changeset_html: '%{commenter} a laissé un commentaire à %{time} + sur un ensemble de modifications que vous suivez créé par %{changeset_author}.' + partial_changeset_with_comment: avec le commentaire « %{changeset_comment} » + partial_changeset_with_comment_html: avec le commentaire « %{changeset_comment} » partial_changeset_without_comment: sans commentaire details: Plus de détails sur l’ensemble de modifications à %{url}. + details_html: Vous pouvez trouver plus de détails sur l’ensemble de modifications + sur %{url}. unsubscribe: Pour vous désabonner des mises à jour de cet ensemble de modifications, - visitez %{url} et cliquez sur « Désabonner ». + visitez %{url} et cliquez sur « Désabonner ». + unsubscribe_html: Pour vous désabonner des mises à jour de cet ensemble de modifications, + visitez %{url} et cliquez sur « Désabonner ». messages: inbox: title: Boîte de réception @@ -1640,7 +1646,7 @@ fr: subject: Objet date: Date no_messages_yet_html: Vous n’avez actuellement aucun message. Pourquoi ne pas - entrer en contact avec quelques %{people_mapping_nearby_link} ? + entrer en contact avec quelques %{people_mapping_nearby_link} ? people_mapping_nearby: personnes qui cartographient aux alentours message_summary: unread_button: Marquer comme non lu @@ -1673,10 +1679,10 @@ fr: subject: Objet date: Date no_sent_messages_html: Vous n’avez encore envoyé aucun message. Pourquoi ne - pas entrer en contact avec quelques %{people_mapping_nearby_link} ? + pas entrer en contact avec quelques %{people_mapping_nearby_link} ? people_mapping_nearby: personnes proche de vous reply: - wrong_user: Vous êtes identifié(e) comme « %{user} » mais le message auquel + wrong_user: Vous êtes identifié(e) comme « %{user} » mais le message auquel vous souhaitez répondre n’a pas été envoyé à cet utilisateur. Veuillez vous connecter avec l’identifiant correct pour pouvoir répondre. show: @@ -1689,7 +1695,7 @@ fr: destroy_button: Supprimer back: Retour to: À - wrong_user: Vous êtes identifié comme « %{user} » mais le message que vous essayez + wrong_user: Vous êtes identifié comme « %{user} » mais le message que vous essayez de lire n’a pas été envoyé par cet utilisateur, ni ne lui a été destiné. Veuillez vous connecter avec l’identifiant correct pour pouvoir le lire. sent_message_summary: @@ -1699,12 +1705,30 @@ fr: as_unread: Message marqué comme non lu destroy: destroyed: Message supprimé + shared: + markdown_help: + title_html: Analysé avec kramdown + headings: Titres + heading: Titre + subheading: Sous-titre + unordered: Liste non ordonnée + ordered: Liste ordonnée + first: Premier élément + second: Deuxième élément + link: Lien + text: Texte + image: Image + alt: Texte alternatif + url: URL + richtext_field: + edit: Modifier + preview: Aperçu site: about: next: Suivant copyright_html: © Contributeurs
d’OpenStreetMap - used_by_html: '%{name} fournit les données cartographiques de milliers de sites - web, d''applications mobiles et d''appareils' + used_by_html: '%{name} fournit les données cartographiques pour des milliers + de sites web, d’applications mobiles et d’appareils' lede_text: OpenStreetMap est bâti par une communauté de cartographes bénévoles qui contribuent et maintiennent les données des routes, sentiers, cafés, stations ferroviaires et bien plus encore, partout dans le monde. @@ -1724,22 +1748,22 @@ fr: communautaires et \nle site web de la Fondation OSM." open_data_title: Données ouvertes - open_data_html: 'OpenStreetMap est en données ouvertes : vous êtes libre + open_data_html: 'OpenStreetMap est en données ouvertes : vous êtes libre de l’utiliser dans n’importe quel but tant que vous créditez OpenStreetMap et ses contributeurs. Si vous modifiez ou vous appuyez sur les données d’une façon quelconque, vous pouvez distribuer le résultat seulement suivant la - même licence. Consultez la page sur les droits - d’auteur et licence pour plus de détails.' + même licence. Consultez la page sur les droits + d’auteur et la licence pour plus de détails.' legal_title: Informations juridiques legal_1_html: |- Ce site et de nombreux autres services connexes sont formellement exploités par la Fondation OpenStreetMap (OSMF) au nom de la communauté. L’utilisation de tous les services offerts par l’OSMF est sujette à nos Conditions d’utilisation, à notre Politique des usages acceptés et à notre Politique de confidentialité. legal_2_html: |- - Veuillez contacter l’OSMF + Veuillez contacter l’OSMF si vous avez des questions de licence, de droit d’auteur ou d’autres questions légales.
- OpenStreetMap, le logo de loupe grossissante et l’état de la carte sont des marques déposées de OSMF. + OpenStreetMap, le logo de loupe grossissante et l’état de la carte sont des marques déposées de l’OSMF. partners_title: Partenaires copyright: foreign: @@ -1769,22 +1793,20 @@ fr: intro_3_1_html: "Notre documentation est disponible sous la licence \nCreative\nCommons paternité – partage à l’identique 2.0 (CC-BY-SA 2.0)." credit_title_html: Comment créditer OpenStreetMap - credit_1_html: Nous demandons que votre crédit comporte la mention « © les - contributeurs d’OpenStreetMap ». + credit_1_html: Nous demandons que votre crédit comporte la mention « © les + contributeurs d’OpenStreetMap ». credit_2_1_html: |- Vous devez également préciser clairement que les données sont disponibles sous la licence ODbL (Open Database License) et, si vous utilisez les tuiles de notre carte, que la carte est sous la licence CC BY-SA. Vous pouvez mentionner ceci avec un lien hypertexte vers cette page de mentions légales. - Alternativement, et obligatoirement si vous distribuez OpenStreetMap sous forme de données brutes, vous pouvez directement nommer et fournir un lien vers la ou les licences. Sur les supports où les liens hypertexte sont impossibles (par exemple sur un support papier), nous vous suggérons de rediriger vos lecteurs vers le site openstreetmap.org (éventuellement en développant « OpenStreetMap » en son adresse complète openstreetmap.org), vers opendatacommons.org et, si c’est pertinent, vers creativecommons.org. - credit_3_1_html: "Les carrés de la carte dans le “style standard” - sur www.openstreetmap.org sont un travail produit par la fondation OpenStreetMap - en utilisant les données de OpenStreetMap sous la licence Open Database. - Si vous utilisez ces carrés, veuillez utiliser l’attribution suivante : - \n“Carte de base et données de OpenStreetMap et de la Fondation OpenStreetMap”." + Alternativement, et obligatoirement si vous distribuez OpenStreetMap sous forme de données brutes, vous pouvez directement nommer et fournir un lien vers la ou les licences. Sur les supports où les liens hypertextes sont impossibles (par exemple sur un support papier), nous vous suggérons de rediriger vos lecteurs vers le site openstreetmap.org (éventuellement en développant « OpenStreetMap » vers cette adresse complète) et vers opendatacommons.org. + credit_3_1_html: |- + Les tuiles de la carte dans le « style standard » sur www.openstreetmap.org sont un travail produit par la Fondation OpenStreetMap en utilisant les données d’OpenStreetMap sous la licence Open Database. Si vous utilisez ces tuiles, veuillez utiliser l’attribution suivante : + « Fond de carte et données d’OpenStreetMap et de la Fondation OpenStreetMap ». credit_4_html: |- Pour une carte électronique navigable, le crédit devrait apparaître dans un coin de la carte. - Par exemple : + Par exemple : attribution_example: alt: Exemple d’attribution d’OpenStreetMap sur une page Internet title: Exemple d’attribution @@ -1802,49 +1824,48 @@ fr: contributors_title_html: Nos contributeurs contributors_intro_html: 'Nos contributeurs sont des milliers de personnes. Nous incluons également des données publiées sous licence ouverte par des - agences nationales de cartographie et par d’autres sources, notamment :' + agences nationales de cartographie et par d’autres sources, notamment :' contributors_at_html: |- - Autriche : contient des données sur la ville de Vienne (sous + Autriche : contient des données sur la ville de Vienne (sous licence CC BY), la région du Vorarlberg et la région du Tyrol (sous licence CC BY AT avec amendements). contributors_au_html: |- - Australie : contient des données sourcées de + Australie : contient des données sourcées de PSMA Australia Limited publiées sous la licence CC BY 4.0 accordée par le Commonwealth d’Australie. - contributors_ca_html: 'Canada : contient des données de GeoBase®, + contributors_ca_html: 'Canada : contient des données de GeoBase®, GeoGratis (© Département des Ressources naturelles du Canada), CanVec (© Département des Ressources naturelles du Canada) et StatCan (Division Géographie, Statistiques du Canada).' - contributors_fi_html: 'Finlande : contient des données de + contributors_fi_html: 'Finlande : contient des données de la Base de données topographique de l’Inspection nationale du territoire de Finlande et d’autres ensembles de données, sous licence NLSFI.' - contributors_fr_html: 'France : contient des données de la + contributors_fr_html: 'France : contient des données de la Direction générale des finances publiques (anciennement la Direction générale des impôts).' - contributors_nl_html: 'Pays-Bas : contient des données © Pays-Bas : contient des données © AND, 2007 (www.and.com).' - contributors_nz_html: "Nouvelle-Zélande : contient des données - provenant du service de données LINZ - et pour la réutilisation, sous licence \nCC - BY 4.0." - contributors_si_html: 'Slovénie : contient des données de + contributors_nz_html: 'Nouvelle-Zélande : contient des données + provenant du service de données LINZ + et, pour la réutilisation, sous licence CC + BY 4.0.' + contributors_si_html: 'Slovénie : contient des données de l’Autorité de Planification et de Cartographie et du Ministère de l’Agriculture, de - la Forêt et de l’Alimentation (information publique de la Slovénie).' - contributors_es_html: 'Espagne: contient des données fournies - par l''Institut Géographique National Espagnol (IGN) + la Forêt et de l’Alimentation (informations publiques de la Slovénie).' + contributors_es_html: 'Espagne : contient des données fournies + par l’Institut Géographique National Espagnol (IGN) et le Système Cartographique National (SCNE) sous licence CC BY - 4.0 pour la réutilisation .' - contributors_za_html: |- - Afrique du Sud : contient des données issues de la Direction principale des - Informations Géospatiales Nationales, copyright de l’État réservé. - contributors_gb_html: |- - Royaume-Uni : contient des données issues de - l’Ordnance Survey © 2010–2019 Droits d’auteurs et de la - base de données de la Couronne. + 4.0 pour la réutilisation.' + contributors_za_html: 'Afrique du Sud : contient des données + issues de la Direction principale des Informations + Géospatiales Nationales, copyright de l’État réservé.' + contributors_gb_html: 'Royaume-Uni : contient des données + issues de l’Ordnance Survey © 2010–2019 Droits d’auteurs et de + la base de données de la Couronne.' contributors_footer_1_html: Pour plus de détails sur celles-ci et sur les autres sources utilisées pour aider à améliorer OpenStreetMap, consultez la page des contributeurs @@ -1865,7 +1886,7 @@ fr: href="https://dmca.openstreetmap.org/">formulaire en ligne. trademarks_title_html: Marques trademarks_1_html: OpenStreetMap, le logo avec la loupe et ''State of the - Map'' sont des marques déposées de l'OpenStreetMap Foundation. Si vous avez + Map'' sont des marques déposées de l’OpenStreetMap Foundation. Si vous avez des questions à propos de l’utilisation de ces marques, merci de consulter notre règlement concernant les marques déposées. @@ -1890,18 +1911,6 @@ fr: user_page_link: page utilisateur anon_edits_html: (%{link}) anon_edits_link_text: Trouvez pourquoi ici. - flash_player_required_html: Vous avez besoin d’un lecteur Flash pour utiliser - Potlatch, l’éditeur Flash d’OpenStreetMap. Vous pouvez télécharger - Flash Player depuis le site d’Adobe. D’autres - options sont également disponibles pour modifier OpenStreetMap. - potlatch_unsaved_changes: Vous avez des modifications non enregistrées. (Pour - enregistrer dans Potlatch, désélectionnez la ligne ou le nœud actuel lors - d’une modification en direct, ou cliquez sur le bouton Enregistrer s’il est - affiché.) - potlatch2_not_configured: Potlatch 2 n’a pas été configuré – Veuillez consulter - https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 pour plus d’informations. - potlatch2_unsaved_changes: Vous avez des modifications non enregistrées. (Pour - enregistrer vos modifications dans Potlach 2, cliquez sur le bouton Enregistrer) id_not_configured: iD n’a pas été configuré no_iframe_support: Votre navigateur ne prend pas en charge les ''iframes HTML'', qui sont nécessaires pour cette fonctionnalité. @@ -1918,14 +1927,14 @@ fr: Open Data Commons Open Database (ODbL). too_large: advice: 'Si l’export ci-dessus échoue, veuillez envisager l’utilisation de - l’une des sources listées ci-dessous :' + l’une des sources listées ci-dessous :' body: Cette zone est trop vaste pour être exportée au format OpenStreetMap - XML. Veuillez zoomer ou sélectionner une zone plus petite, ou utiliser une - des sources suivantes pour le téléchargement de données massives. + XML. Veuillez zoomer ou sélectionner une zone plus petite ou utiliser une + des sources suivantes pour le téléchargement massif de données. planet: title: Planète OSM description: Copies régulièrement mises à jour de la base de données complète - de OpenStreetMap + d’OpenStreetMap overpass: title: API Overpass description: Télécharger ce cadre englobant depuis un miroir de la base @@ -1936,10 +1945,11 @@ fr: pays et des villes sélectionnées metro: title: Extractions de Metro - description: Extractions des principales villes du monde et de leurs environs + description: Extractions des principales villes et métropoles du monde et + de leurs environs other: title: Autres sources - description: Sources supplémentaires listées dans le wiki de OpenStreetMap + description: Sources supplémentaires listées dans le wiki d’OpenStreetMap options: Options format: Format scale: Échelle @@ -1947,13 +1957,13 @@ fr: image_size: Taille de l’image zoom: Zoom add_marker: Ajouter un marqueur sur la carte - latitude: 'Lat :' - longitude: 'Lon :' + latitude: 'Lat. :' + longitude: 'Lon. :' output: Sortie paste_html: Copier le code HTML à intégrer dans un site web export_button: Exporter fixthemap: - title: Signaler un problème / Corriger la carte + title: Signaler un problème / Corriger la carte how_to_help: title: Comment aider join_the_community: @@ -1964,37 +1974,37 @@ fr: ou réparer les données vous-même. add_a_note: instructions_html: |- - Cliquez simplement sur ou cette même icône sur l’affichage de la carte. + Cliquez simplement sur ou cette même icône sur l’affichage de la carte. Cela placera un marqueur sur la carte, que vous pourrez déplacer en le glissant. Ajoutez votre message, puis cliquez sur Enregistrer, et d’autres cartographes l’étudieront. other_concerns: title: Autres préoccupations explanation_html: Si vous êtes préoccupé par la manière dont nos données sont - utilisées ou sur leur contenu, veuillez consulter notre page - des droits d’auteur pour davantage d’informations légales ou contacter - le groupe de - travail OSMF approprié. + utilisées ou sur leur contenu, veuillez consulter notre page + relative aux droits d’auteur pour davantage d’informations légales ou + contacter le groupe + de travail OSMF approprié. help: title: Obtenir de l’aide introduction: OpenStreetMap propose plusieurs ressources pour apprendre à travailler - dans le projet, pour poser des questions et y répondre, et pour discuter et + dans le projet, pour poser des questions et y répondre et pour discuter ou documenter les sujets de cartographie en collaboration avec d’autres utilisateurs. welcome: url: /welcome - title: Bienvenue à OpenStreetMap + title: Bienvenue dans OpenStreetMap description: Commencer avec ce guide rapide couvrant les bases d’OpenStreetMap. beginners_guide: url: https://wiki.openstreetmap.org/wiki/FR:Guide_du_d%C3%A9butant title: Guide du débutant - description: Guide pour les débutants maintenu par la communauté. + description: Guide maintenu par la communauté pour les débutants. help: url: https://help.openstreetmap.org/ - title: Forum d'aide + title: Forum d’aide description: Poser une question ou chercher des réponses sur le site de questions-et-réponses d’OpenStreetMap. mailing_lists: title: Listes de diffusion description: Poser une question ou discuter de questions intéressantes sur - un large éventail de thématiques ou des listes de diffusion régionaux. + un large éventail de listes de diffusion thématiques ou régionales. forums: title: Forums description: Des questions et des discussions pour ceux qui préfèrent une @@ -2010,12 +2020,21 @@ fr: welcomemat: url: https://wiki.openstreetmap.org/wiki/FR:Page_principale title: Pour les organisations - description: Dans une organisation qui fait des plans pour OpenStreetMap ? + description: Dans une organisation qui fait des plans pour OpenStreetMap ? Trouvez ce que vous avez besoin de savoir dans le tapis d’accueil. wiki: url: https://wiki.openstreetmap.org/wiki/FR:Page_principale - title: Wiki OpenStreetMap - description: Parcourez le wiki pour la documentation approfondie d’OpenStreetMap + title: Wiki d’OpenStreetMap + description: Parcourez le wiki pour la documentation approfondie d’OpenStreetMap. + potlatch: + removed: Votre éditeur OpenStreetMap par défaut est fixé à Potlatch. Comme Adobe + Flash Player a été retiré, Potlatch n’est plus disponible à l’utilisation + dans un navigateur web. + desktop_html: Vous pouvez toujours utiliser Potlatch en téléchargeant + l’application de bureau pour Mac et Windows. + id_html: Sinon, vous pouvez définir votre éditeur par défaut à iD, qui tourne + dans votre navigateur web comme Potlatch auparavant. Modifier + vos préférences ici. sidebar: search_results: Résultats de la recherche close: Fermer @@ -2025,7 +2044,7 @@ fr: get_directions_title: Trouvez des itinéraires entre deux points from: De to: À - where_am_i: Où est-ce ? + where_am_i: Où est-ce ? where_am_i_title: Décrit la position actuelle en utilisant le moteur de recherche submit_text: Aller reverse_directions_text: Inverser les directions @@ -2118,10 +2137,10 @@ fr: url: URL welcome: title: Bienvenue ! - introduction_html: Bienvenue à OpenStreetMap, la carte du monde libre et éditable. - Maintenant que vous êtes enregistré, vous avez tout ce qu’il faut pour commencer - à cartographier. Ce qui suit est un petit guide des choses les plus importantes - à savoir. + introduction_html: Bienvenue dans OpenStreetMap, la carte du monde libre et + éditable. Maintenant que vous êtes inscrit, vous avez tout ce qu’il faut pour + commencer à cartographier. Ce qui suit est un petit guide des choses les plus + importantes à savoir. whats_on_the_map: title: Ce qu’il y a sur la carte on_html: OpenStreetMap sert à cartographier des objets qui sont à la fois @@ -2129,7 +2148,7 @@ fr: et d’autres détails sur des lieux. Vous pouvez cartographier n’importe quel élément du monde réel qui vous intéresse. off_html: Ce qui est par contre exclu sont les données subjectives - comme les cotes de popularité, les éléments historiques ou hypothétiques, + comme les cotes de popularité, les éléments historiques ou hypothétiques et les données venant de source protégées par le droit d’auteur ou des droits voisins. À moins d’avoir une permission spéciale, ne copiez rien depuis une carte papier ou en ligne. @@ -2151,23 +2170,23 @@ fr: paragraph_1_html: OpenStreetMap a quelques règles formelles, mais nous attendons de tous les participants une collaboration et une communication avec la communauté. Si vous envisagez d’autres activités que la modification à la - main, veuillez lire et suivre les directives sur les - importations et les + main, veuillez lire et suivre les directives sur les + importations et les modifications automatiques. questions: title: Des questions ? paragraph_1_html: |- - OpenStreetMap propose plusieurs ressources pour apprendre à travailler dans le projet, pour poser des questions et y répondre, et pour discuter et documenter les sujets de cartographie en collaboration avec d’autres utilisateurs. - Trouver de l’aide ici. Dans une organisation qui fait des plans pour OpenStreetMap ? Vérifiez votre tapis d’accueil. + OpenStreetMap propose plusieurs ressources pour apprendre à travailler dans le projet, pour poser des questions et y répondre, ainsi que pour discuter ou documenter les sujets de cartographie en collaboration avec d’autres utilisateurs. + Trouver de l’aide ici. Vous êtes dans une organisation qui fait des plans pour OpenStreetMap ? Vérifiez votre tapis d’accueil. start_mapping: Commencer à cartographier add_a_note: - title: Pas le temps d’effectuer les modifications ? Ajoutez une note ! + title: Pas le temps d’effectuer les modifications ? Ajoutez une note ! paragraph_1_html: |- Si vous voulez juste une petite correction et n’avez pas le temps de vous enregistrer sur le projet et d’apprendre à effectuer les modifications, il est facile d’ajouter une note. paragraph_2_html: |- - Allez simplement sur la carte et cliquez sur l’icône note : - . Cela ajoutera un marqueur sur la carte, que vous pouvez déplacer en faisant glisser la carte. Ajoutez votre message puis cliquez sur Enregistrer, et d’autres contributeurs iront regarder. + Allez simplement sur la carte et cliquez sur l’icône note : + . Cela ajoutera un marqueur sur la carte, que vous pouvez déplacer en faisant glisser la carte. Ajoutez votre message puis cliquez sur Enregistrer, alors d’autres contributeurs iront enquêter. traces: visibility: private: Privé (partagé anonymement, points non ordonnés) @@ -2178,29 +2197,29 @@ fr: points ordonnés avec les dates) new: upload_trace: Téléverser la trace GPS - visibility_help: qu’est-ce que cela veut dire ? + visibility_help: qu’est-ce que cela signifie ? visibility_help_url: https://wiki.openstreetmap.org/wiki/FR:Visibilit%C3%A9_des_traces_GPS help: Aide help_url: https://wiki.openstreetmap.org/wiki/FR:Upload create: upload_trace: Envoyer la trace GPS - trace_uploaded: Votre fichier GPX a été envoyé et est en attente de son intégration + trace_uploaded: Votre fichier GPX a été téléversé et est en attente de son intégration dans la base de données. Ceci prend en général moins d’une demi-heure et un courriel vous sera envoyé lorsque ce sera terminé. - upload_failed: Désolé, échec du chargement GPX. Un administrateur a été averti - de l'erreur. Veuillez réessayer + upload_failed: Désolé, le téléversement GPX a échoué. Un administrateur a été + averti de l’erreur. Veuillez essayer à nouveau. traces_waiting: - one: Vous avez %{count} trace en attente de chargement. Il serait peut-être + one: Vous avez une trace en attente de téléversement. Il serait peut-être préférable d’attendre qu’elle soit terminée avant d’en charger d’autres, afin de ne pas bloquer la file d’attente pour les autres utilisateurs. - other: Vous avez %{count} traces en attente de chargement. Il serait peut-être + other: Vous avez %{count} traces en attente de téléversement. Il serait peut-être préférable d’attendre qu’elles soient terminées avant d’en charger d’autres, afin de ne pas bloquer la file d’attente pour les autres utilisateurs. edit: cancel: Annuler title: Modifier la trace %{name} heading: Modifier la trace %{name} - visibility_help: qu’est-ce que cela veut dire ? + visibility_help: qu’est-ce que cela signifie ? update: updated: Traces mises à jour trace_optionals: @@ -2209,23 +2228,23 @@ fr: title: Affichage de la trace %{name} heading: Affichage de la trace %{name} pending: EN ATTENTE - filename: 'Nom du fichier :' + filename: 'Nom du fichier :' download: télécharger - uploaded: 'Envoyé le :' - points: 'Points :' - start_coordinates: 'Coordonnées de départ :' - coordinates_html: '%{latitude} ; %{longitude}' + uploaded: 'Téléversé le :' + points: 'Points :' + start_coordinates: 'Coordonnées de départ :' + coordinates_html: '%{latitude} ; %{longitude}' map: carte edit: modifier - owner: 'Propriétaire :' - description: 'Description :' - tags: 'Mots-clés :' + owner: 'Propriétaire :' + description: 'Description :' + tags: 'Mots-clés :' none: Aucun edit_trace: Modifier cette piste delete_trace: Supprimer cette piste - trace_not_found: Trace non trouvée ! - visibility: 'Visibilité :' - confirm_delete: Supprimer cette trace ? + trace_not_found: Trace non trouvée ! + visibility: 'Visibilité :' + confirm_delete: Supprimer cette trace ? trace_paging_nav: showing_page: Page %{page} older: Anciennes traces @@ -2251,36 +2270,36 @@ fr: public_traces: Traces GPS publiques my_traces: Mes traces GPS public_traces_from: Traces GPS publiques de %{user} - description: Parcourir les traces GPS récemment téléchargées + description: Parcourir les traces GPS récemment téléversées tagged_with: balisée avec %{tags} - empty_html: Il n’y a encore rien ici. Téléverser une + empty_html: Il n’y a encore rien ici. Téléverser une nouvelle trace ou pour en savoir plus sur le traçage GPS, consultez la - page + page wiki. upload_trace: Envoyer une trace see_all_traces: Voir toutes les traces see_my_traces: Voir mes traces destroy: - scheduled_for_deletion: Piste prévue pour la suppression + scheduled_for_deletion: Trace prévue pour la suppression make_public: - made_public: Trace GPS rendue publique + made_public: Trace rendue publique offline_warning: - message: Le système d’envoi de fichiers GPX est actuellement indisponible + message: Le système de téléversement de fichiers GPX est actuellement indisponible offline: heading: Stockage GPX hors ligne - message: Le système de stockage et d’envoi des fichiers GPX est actuellement + message: Le système de stockage et de téléversement des fichiers GPX est actuellement indisponible. georss: - title: Traces GPS de OpenStreetMap + title: Traces GPS d’OpenStreetMap description: description_with_count: one: Fichier GPX avec %{count} point de %{user} other: Fichier GPX avec %{count} points de %{user} description_without_count: Fichier GPX de %{user} application: - permission_denied: Vous n'avez pas la permission d’accéder à cette action + permission_denied: Vous n’avez pas le droit d’accéder à cette action require_cookies: - cookies_needed: Il semble que les témoins (cookies) soient désactivés sur votre + cookies_needed: Il semble que les témoins (cookies) soient désactivés dans votre navigateur. Veuillez les activer avant de continuer. require_admin: not_an_admin: Vous devez être un administrateur pour effectuer cette action. @@ -2299,15 +2318,15 @@ fr: %{user}. Veuillez vérifiez si vous désirez que l’application dispose des droits suivants. Vous pouvez lui accorder autant ou aussi peu de droits que vous le souhaitez. - allow_to: 'Autoriser l’application client à :' - allow_read_prefs: lire vos préférences utilisateur. - allow_write_prefs: modifier vos préférences utilisateur. - allow_write_diary: créer des entrées dans le journal, des commentaires et ajouter - des amis. - allow_write_api: modifier la carte. - allow_read_gpx: lire vos traces GPS privées. - allow_write_gpx: envoyer des traces GPS. - allow_write_notes: modifier les notes. + allow_to: 'Autoriser l’application cliente à :' + allow_read_prefs: lire vos préférences utilisateur ; + allow_write_prefs: modifier vos préférences utilisateur ; + allow_write_diary: créer pour vous des entrées dans votre journal, faire des + commentaires et ajouter des amis ; + allow_write_api: modifier la carte en votre nom ; + allow_read_gpx: lire vos traces GPS privées ; + allow_write_gpx: envoyer des traces GPS en votre nom ; + allow_write_notes: modifier des notes en votre nom. grant_access: Accorder l’accès authorize_success: title: La demande d’autorisation a été acceptée @@ -2321,7 +2340,7 @@ fr: revoke: flash: Vous avez révoqué le jeton pour %{application} permissions: - missing: Vous n’avez pas autorisé l’application à accéder à cette installation + missing: Vous n’avez pas autorisé l’application à accéder à cette fonctionnalité oauth_clients: new: title: Enregistrer une nouvelle application @@ -2350,7 +2369,7 @@ fr: revoke: Révoquer ! my_apps: Mes applications clientes no_apps_html: Avez-vous une application qui aimerait s’enregistrer pour utiliser - le standard %{oauth} ? Vous devez enregistrer votre application web avant + le standard %{oauth} ? Vous devez enregistrer votre application web avant qu’elle ne puisse faire des requêtes OAuth sur ce service. oauth: OAuth registered_apps: 'Vous avez les applications clientes suivantes enregistrées @@ -2368,29 +2387,29 @@ fr: flash: Enregistrement de l’application cliente supprimé users: login: - title: Se connecter + title: Connexion heading: Connexion - email or username: 'Adresse de courriel ou nom d’utilisateur :' - password: 'Mot de passe :' - openid_html: '%{logo} OpenID :' + email or username: 'Adresse de courriel ou nom d’utilisateur :' + password: 'Mot de passe :' + openid_html: '%{logo} OpenID :' remember: Se souvenir de moi - lost password link: Vous avez perdu votre mot de passe ? + lost password link: Vous avez perdu votre mot de passe ? login_button: Se connecter register now: S’inscrire maintenant - with username: 'Vous avez déjà un compte sur OpenStreetMap ? Connectez-vous - avec votre identifiant et votre mot de passe :' - with external: 'À la place, utilisez un tiers pour vous connecter :' - new to osm: Nouveau sur OpenStreetMap ? - to make changes: Pour apporter des modifications aux données OpenStreetMap, + with username: 'Vous avez déjà un compte sur OpenStreetMap ? Connectez-vous + avec votre identifiant et votre mot de passe :' + with external: 'Vous pouvez également utiliser un service tiers pour vous connecter :' + new to osm: Nouveau sur OpenStreetMap ? + to make changes: Pour apporter des modifications aux données d’OpenStreetMap, vous devez posséder un compte. create account minute: Créer un compte. Ça ne prend qu’une minute. - no account: Vous n’avez pas encore de compte ? - account not active: Désolé, votre compte n’est pas encore actif.
Veuillez - cliquer sur le lien dans le courrier électronique de confirmation, pour activer - votre compte, ou demandez un nouveau courrier de confirmation. + no account: Vous n’avez pas encore de compte ? + account not active: Désolé, votre compte n’est pas encore actif.
Veuillez + cliquer sur le lien dans le courriel de confirmation pour activer votre compte, + sinon demandez un nouveau courriel de confirmation. account is suspended: Désolé, votre compte a été suspendu en raison d’une activité - suspecte.
Veuillez contacter le webmaster - si vous voulez en discuter. + suspecte.
Veuillez contacter le responsable du + site si vous voulez en discuter. auth failure: Désolé, mais les informations fournies n’ont pas permis de vous identifier. openid_logo_alt: Se connecter avec un OpenID @@ -2400,37 +2419,37 @@ fr: alt: Se connecter avec une URL OpenID google: title: Se connecter avec Google - alt: Se connecter avec l’OpenID de Google + alt: Se connecter avec un OpenID de Google facebook: title: Se connecter avec Facebook - alt: Se connecter avec un compte Facebook + alt: Se connecter avec un compte de Facebook windowslive: title: Connexion avec Windows Live - alt: Se connecter avec un compte Windows Live + alt: Se connecter avec un compte de Windows Live github: title: Connexion avec GitHub - alt: Connexion avec un Compte GitHub + alt: Connexion avec un compte de GitHub wikipedia: title: Se connecter avec Wikipédia alt: Se connecter avec un compte de Wikipédia yahoo: title: Se connecter avec Yahoo - alt: Se connecter avec l’OpenID de Yahoo + alt: Se connecter avec un OpenID de Yahoo wordpress: title: Se connecter avec Wordpress - alt: Se connecter avec l’OpenID de Wordpress + alt: Se connecter avec un OpenID de Wordpress aol: title: Se connecter avec AOL - alt: Se connecter avec l’OpenID d’AOL + alt: Se connecter avec un OpenID d’AOL logout: title: Déconnexion heading: Déconnexion d’OpenStreetMap logout_button: Déconnexion lost_password: title: Mot de passe perdu - heading: Vous avez perdu votre mot de passe ? - email address: 'Adresse de courriel :' - new password button: Envoyer un nouveau mot de passe + heading: Vous avez perdu votre mot de passe ? + email address: 'Adresse de courriel :' + new password button: Réinitialiser le mot de passe help_text: Entrez l’adresse de courriel que vous avez utilisée à votre inscription, nous enverrons à cette adresse un lien que vous pourrez utiliser pour réinitialiser votre mot de passe. @@ -2447,75 +2466,76 @@ fr: title: S’inscrire no_auto_account_create: Malheureusement, nous sommes actuellement dans l’impossibilité de vous créer un compte automatiquement. - contact_webmaster_html: Veuillez contacter le webmaster - pour qu’il vous crée un compte – nous essaierons de traiter votre demande - le plus rapidement possible. + contact_webmaster_html: Veuillez contacter le responsable + du site pour qu’il vous crée un compte – nous essaierons de traiter votre + demande le plus rapidement possible. about: header: Libre et modifiable html: |-

À la différence des autres cartes, OpenStreetMap est entièrement créé par des gens comme vous, et chacun est libre de le modifier, le mettre à jour, le télécharger et l’utiliser.

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

- email address: 'Adresse de courriel :' - confirm email address: 'Confirmez l’adresse de courriel :' - not_displayed_publicly_html: Votre adresse n'est pas affichée publiquement, - voir notre charte sur la confidentialité - pour plus d'information - display name: 'Nom affiché :' + email address: 'Adresse de courriel :' + confirm email address: 'Confirmez l’adresse de courriel :' + not_displayed_publicly_html: Votre adresse n’est pas affichée publiquement, + voir notre politique de confidentialité pour plus d’informations + display name: 'Nom affiché :' display name description: Votre nom d’utilisateur affiché publiquement. Vous pouvez changer ceci ultérieurement dans les préférences. - external auth: 'Authentification tierce :' - password: 'Mot de passe :' - confirm password: 'Confirmez le mot de passe :' - use external auth: À la place, utilisez un tiers pour vous connecter + external auth: 'Authentification tierce :' + password: 'Mot de passe :' + confirm password: 'Confirmez le mot de passe :' + use external auth: Vous pouvez également utiliser un service tiers pour vous + connecter. auth no password: Avec l’authentification par tiers, un mot de passe n’est pas nécessaire, mais des outils supplémentaires ou un serveur peuvent toujours en nécessiter un. continue: S’inscrire - terms accepted: Merci d’avoir accepté les nouveaux termes du contributeur ! + terms accepted: Merci d’avoir accepté les nouveaux termes du contributeur ! terms declined: Nous sommes désolés que vous ayez décidé de ne pas accepter - les nouvelles conditions de contributions. Pour plus d’informations, veuillez + les nouvelles Conditions de contribution. Pour plus d’informations, veuillez consulter cette page wiki. terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined terms: title: Conditions heading: Conditions - heading_ct: Conditions du contributeur + heading_ct: Conditions de contribution read and accept with tou: Veuillez lire l’accord du contributeur et les conditions - d’utilisation, cocher les deux cases une fois ceci fait, puis appuyer sur + d’utilisation ; une fois ceci fait cochez les deux cases, puis appuyer sur le bouton Continuer. contributor_terms_explain: Cet accord impose les conditions de vos contributions existantes et à venir. - read_ct: J’ai lu et j’accepte les conditions de contributeur ci-dessus - tou_explain_html: Ce %{tou_link} conditionne l’utilisation du site web et des - autres infrastructures fournies par OSMF. Veuillez cliquer sur le lien, lire - et accepter le texte. + read_ct: J’ai lu et j’accepte les Conditions de contribution ci-dessus. + tou_explain_html: Ces %{tou_link} régissent l’utilisation du site web et des + autres infrastructures fournies par OSMF. Veuillez cliquer sur le lien pour + les lire et accepter le texte. read_tou: J’ai lu et j’accepte les Conditions d’utilisation consider_pd: En plus de l’accord ci-dessus, je considère mes contributions comme - étant dans le domaine public - consider_pd_why: qu’est-ce que ceci ? + étant dans le domaine public. + consider_pd_why: qu’est-ce que ceci ? consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain - guidance_html: 'Pour plus d''information sur ces termes : un résumé + guidance_html: 'Pour plus d’information sur ces conditions : un résumé lisible et quelques traductions informelles' continue: Continuer declined: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined - decline: Décliner + decline: Refuser you need to accept or decline: Veuillez lire et ensuite soit accepter ou refuser - les nouvelles conditions de contributeur pour continuer. - legale_select: 'Veuillez sélectionner votre pays de résidence :' + les nouvelles Conditions du contributeur pour continuer. + legale_select: 'Veuillez sélectionner votre pays de résidence :' legale_names: france: France italy: Italie rest_of_world: Reste du monde no_such_user: title: Utilisateur inexistant - heading: L'utilisateur %{user} n'existe pas - body: Désolé, il n’y a pas d’utilisateur avec le nom %{user}. Veuillez vérifier - l’orthographe, ou le lien que vous avez cliqué n’est pas valide. + heading: L’utilisateur %{user} n’existe pas + body: Désolé, il n’y a aucun utilisateur avec le nom %{user}. Veuillez vérifier + l’orthographe, ou bien le lien que vous avez cliqué n’est pas correct. deleted: supprimé show: my diary: Mon journal - new diary entry: nouvelle entrée dans le journal + new diary entry: nouvelle entrée du journal my edits: Mes modifications my traces: Mes traces my notes: Mes notes @@ -2533,30 +2553,30 @@ fr: notes: Notes de carte remove as friend: Supprimer en tant qu’ami add as friend: Ajouter en tant qu’ami - mapper since: 'Cartographe depuis :' - ct status: 'Conditions du contributeur:' + mapper since: 'Cartographe depuis :' + ct status: 'Conditions de contribution :' ct undecided: Indécis - ct declined: Refusé - latest edit: 'Dernière modification (%{ago}) :' - email address: 'Adresse de courriel :' - created from: 'Créé depuis :' - status: 'État :' - spam score: 'Indice de pollution :' + ct declined: Refusées + latest edit: 'Dernière modification (%{ago}) :' + email address: 'Adresse de courriel :' + created from: 'Créé depuis :' + status: 'État :' + spam score: 'Indice de pollution :' description: Description user location: Emplacement de l’utilisateur - if_set_location_html: Positionner votre lieu d’habitation sur la page %{settings_link} + if_set_location_html: Définissez votre lieu d’habitation sur la page %{settings_link} pour voir les utilisateurs à proximité. settings_link_text: options my friends: Mes amis - no friends: Vous n’avez pas encore ajouté d’ami - km away: '%{count} km' - m away: distant de %{count} m + no friends: Vous n’avez pas encore ajouté d’ami. + km away: à %{count} km + m away: à %{count} m nearby users: Autres utilisateurs à proximité no nearby users: Aucun utilisateur n’a encore signalé qu’il cartographiait à proximité. role: - administrator: Cet utilisateur est un administrateur - moderator: Cet utilisateur est un modérateur + administrator: C’est un administrateur ou une administratrice + moderator: C’est un modérateur ou une modératrice grant: administrator: Octroyer l’accès administrateur moderator: Octroyer l’accès modérateur @@ -2566,101 +2586,102 @@ fr: block_history: Blocages actifs moderator_history: Blocages donnés comments: Commentaires - create_block: Bloquer cet utilisateur - activate_user: Activer cet utilisateur - deactivate_user: Désactiver cet utilisateur - confirm_user: Confirmer cet utilisateur - hide_user: Masquer cet utilisateur - unhide_user: Réafficher cet utilisateur - delete_user: Supprimer cet utilisateur + create_block: Bloquer cet utilisateur ou cette utilisatrice + activate_user: Activer cet utilisateur ou cette utilisatrice + deactivate_user: Désactiver cet utilisateur ou cette utilisatrice + confirm_user: Confirmer cet utilisateur ou cette utilisatrice + hide_user: Masquer cet utilisateur ou cette utilisatrice + unhide_user: Réafficher cet utilisateur ou cette utilisatrice + delete_user: Supprimer cet utilisateur ou cette utilisatrice confirm: Confirmer - friends_changesets: Groupes de modifications des amis - friends_diaries: Entrées de journal des amis - nearby_changesets: Groupes de modifications des utilisateurs à proximité - nearby_diaries: Entrées de journal des utilisateurs à proximité - report: Signaler cet utilisateur + friends_changesets: groupes de modifications des amis + friends_diaries: entrées de journal des amis + nearby_changesets: groupes de modifications des utilisateurs à proximité + nearby_diaries: entrées de journal des utilisateurs à proximité + report: Signaler cet utilisateur ou cette utilisatrice popup: your location: Votre emplacement nearby mapper: Cartographe à proximité - friend: Ami + friend: Ami(e) account: title: Modifier le compte my settings: Mes options - current email address: 'Adresse de courriel actuelle :' - new email address: 'Nouvelle adresse de courriel :' - email never displayed publicly: (jamais affiché publiquement) - external auth: 'Authentification externe :' + current email address: 'Adresse de courriel actuelle :' + new email address: 'Nouvelle adresse de courriel :' + email never displayed publicly: (jamais affichée publiquement) + external auth: 'Authentification externe :' openid: link: https://wiki.openstreetmap.org/wiki/OpenID - link text: qu’est-ce que ceci ? + link text: qu’est-ce que ceci ? public editing: - heading: 'Modification publique :' + heading: 'Modification publique :' enabled: Activée. Non anonyme et peut modifier les données. enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits - enabled link text: qu’est-ce que ceci ? - disabled: Désactivée et ne peut pas modifier les données ; toutes les précédentes + enabled link text: qu’est-ce que ceci ? + disabled: Désactivée et ne peut pas modifier les données ; toutes les précédentes modifications sont anonymes. - disabled link text: pourquoi ne puis-je pas modifier ? + disabled link text: pourquoi ne puis-je pas modifier ? public editing note: heading: Modification publique - html: Votre compte est actuellement en mode de « modifications anonymes » + html: Votre compte est actuellement en mode de « modifications anonymes » et les autres contributeurs ne peuvent pas vous envoyer de message ni connaître votre localisation géographique. Pour qu’il soit possible de lister vos contributions et permettre aux autres personnes de vous contacter via ce site, cliquez sur le bouton ci-dessous. Depuis le basculement de l’API - en version 0.6, seuls les utilisateurs en mode de « modifications publiques - » peuvent modifier les données des cartes (en + en version 0.6, seuls les utilisateurs en mode de « modifications publiques » + peuvent modifier les données des cartes (en savoir plus).
  • Votre adresse de courriel ne sera pas rendue publique.
  • Cette opération ne peut pas être annulée et tous les nouveaux utilisateurs sont - maintenant en mode de « modifications publiques » par défaut.
+ maintenant en mode de « modifications publiques » par défaut. contributor terms: - heading: 'Termes du contributeur :' - agreed: Vous avez accepté les nouveaux termes du contributeur. - not yet agreed: Vous n’avez pas encore accepté les nouveaux termes du contributeur. + heading: 'Conditions de contribution :' + agreed: Vous avez accepté les nouvelles Conditions de contribution. + not yet agreed: Vous n’avez pas encore accepté les nouvelles Conditions de + contribution. review link text: Veuillez suivre ce lien à votre convenance pour examiner - et accepter les nouveaux termes du contributeur. + et accepter les nouvelles Conditions de contribution. agreed_with_pd: Vous avez également déclaré que vous considériez vos modifications comme relevant du domaine public. link: https://www.osmfoundation.org/wiki/License/Contributor_Terms - link text: qu’est-ce que ceci ? - profile description: 'Description du profil :' - preferred languages: 'Langues préférées :' - preferred editor: 'Éditeur préféré :' - image: 'Image :' + link text: qu’est-ce que ceci ? + profile description: 'Description du profil :' + preferred languages: 'Langues préférées :' + preferred editor: 'Éditeur préféré :' + image: 'Image :' gravatar: gravatar: Utiliser Gravatar - link: http://wiki.openstreetmap.org/wiki/Gravatar - link text: qu’est-ce que ceci ? + link: https://wiki.openstreetmap.org/wiki/FR:Gravatar + link text: qu’est-ce que ceci ? disabled: Gravatar a été désactivé. - enabled: L'affichage de votre Gravatar a été activé. + enabled: L’affichage de votre Gravatar a été activé. new image: Ajouter une image keep image: Garder l’image actuelle delete image: Supprimer l’image actuelle replace image: Remplacer l’image actuelle image size hint: (les images carrées d’au moins 100×100 pixels fonctionnent le mieux) - home location: 'Emplacement du domicile :' - no home location: Vous n’avez pas indiqué l’emplacement de votre domicile. - latitude: 'Latitude :' - longitude: 'Longitude :' - update home location on click: Mettre a jour l’emplacement de votre domicile - quand vous cliquez sur la carte ? + home location: 'Lieu de domicile :' + no home location: Vous n’avez pas indiqué votre lieu de domicile. + latitude: 'Latitude :' + longitude: 'Longitude :' + update home location on click: Mettre à jour mon lieu de domicile quand je clique + sur la carte ? save changes button: Enregistrer les modifications make edits public button: Rendre toutes mes modifications publiques return to profile: Retour au profil flash update success confirm needed: Informations sur l’utilisateur mises à jour avec succès. Consultez la boîte de réception de votre messagerie pour - confirmer votre nouvelle adresse courriel. + confirmer votre nouvelle adresse de courriel. flash update success: Informations sur l’utilisateur mises à jour avec succès. confirm: heading: Vérifiez votre courriel ! introduction_1: Nous vous avons envoyé un courriel de confirmation. introduction_2: Confirmez votre compte en cliquant sur le lien dans le courriel et vous pourrez commencer à cartographier. - press confirm button: Appuyer le bouton confirmer ci-dessous pour activer votre + press confirm button: Appuyer le bouton Confirmer ci-dessous pour activer votre compte. button: Confirmer - success: Compte confirmé, merci de vous être enregistré ! + success: Compte confirmé, merci de vous être inscrit ! already active: Ce compte a déjà été confirmé. unknown token: Le code de confirmation a expiré ou n’existe pas. reconfirm_html: Si vous avez besoin que nous vous renvoyions un courriel de @@ -2670,8 +2691,8 @@ fr: que vous aurez confirmé votre compte, vous pourrez commencer à cartographier.

Si vous utilisez un filtre contre les courriels indésirables qui renvoie à l’expéditeur des demandes de confirmation, veuillez ajouter %{sender} - à votre liste blanche, car nous ne sommes pas en mesure de répondre à aucune - des demandes de confirmation. + à votre liste blanche, car nous ne sommes en mesure de répondre à aucune des + demandes de confirmation. failure: L’utilisateur %{name} est introuvable. confirm_email: heading: Confirmer le changement de votre adresse de courriel @@ -2682,7 +2703,7 @@ fr: failure: Une adresse de courriel a déjà été confirmée avec ce jeton d’authentification. unknown_token: Ce code de confirmation a expiré ou n’existe pas. set_home: - flash success: Emplacement du domicile enregistré avec succès + flash success: Lieu de domicile enregistré avec succès go_public: flash success: Toutes vos modifications sont dorénavant publiques et vous êtes autorisé à modifier. @@ -2691,7 +2712,7 @@ fr: heading: Utilisateurs showing: one: Page %{page} (%{first_item} sur %{items}) - other: Page %{page} (%{first_item}-%{last_item} sur %{items}) + other: Page %{page} (%{first_item} à %{last_item} sur %{items}) summary_html: '%{name} créé depuis %{ip_address} le %{date}' summary_no_ip_html: '%{name} créé le %{date}' confirm: Confirmer les utilisateurs sélectionnés @@ -2700,10 +2721,11 @@ fr: suspended: title: Compte suspendu heading: Compte suspendu - webmaster: webmestre + webmaster: responsable du site body_html: |-

- Désolé, votre compte a été suspendu en raison d’une activité suspecte. + Désolé, votre compte a été suspendu en raison d’une + activité suspecte.

Cette décision sera vérifiée prochainement par un administrateur. Vous @@ -2712,7 +2734,7 @@ fr: auth_failure: connection_failed: Échec de la connexion au fournisseur d’authentification invalid_credentials: Informations d’authentification non valides - no_authorization_code: Pas de code d’autorisation + no_authorization_code: Aucun code d’autorisation unknown_signature_algorithm: Algorithme de signature inconnu invalid_scope: Étendue non valide auth_association: @@ -2727,8 +2749,8 @@ fr: not_a_role: La chaîne « %{role} » n’est pas un rôle valide. already_has_role: L’utilisateur possède déjà le rôle « %{role} ». doesnt_have_role: L’utilisateur n’a pas le rôle « %{role} ». - not_revoke_admin_current_user: Impossible d'enlever les droits d'administrateur - à l'utilisateur actuel. + not_revoke_admin_current_user: Impossible de retirer les droits d’administrateur + pour l’utilisateur actuel. grant: title: Confirmer l’octroi du rôle heading: Confirmer l’octroi du rôle @@ -2748,63 +2770,65 @@ fr: user_blocks: model: non_moderator_update: Vous devez être modérateur pour créer ou modifier un blocage. - non_moderator_revoke: Vous devez être modérateur pour révoquer un blocage. + non_moderator_revoke: Vous devez être modérateur pour annuler un blocage. not_found: sorry: Désolé, le blocage d’utilisateur numéro %{id} n’a pas été trouvé. back: Retour à l’index new: - title: Création d’un blocage sur « %{name} » + title: Création d’un blocage sur « %{name} » heading_html: Création d’un blocage sur « %{name} » - reason: Raison pour laquelle « %{name} » est bloqué. Merci de rester aussi calme - et raisonnable que possible et de donner autant de détails que possible sur - la situation, en vous rappelant que ce message sera visible par tous. Sachez - que tout le monde ne comprend pas le jargon de la communauté, alors utilisez - des termes simples et précis. - period: Pendant combien de temps, à partir de maintenant, l’utilisateur doit - être bloqué sur l’API ? - tried_contacting: J’ai contacté l'utilisateur et lui ai demandé d’arrêter. - tried_waiting: J’ai donné un temps raisonnable à l’utilisateur pour répondre - à ces messages. - needs_view: L’utilisateur doit se connecter avant que ce blocage soit effacé + reason: Raison pour laquelle « %{name} » est bloqué(e). Merci de rester aussi + calme et raisonnable que possible et de donner autant de détails que possible + sur la situation, en vous rappelant que ce message sera visible par tous. + Sachez que tout le monde ne comprend pas le jargon de la communauté, alors + utilisez des termes simples et précis. + period: Pendant combien de temps, à partir de maintenant, l’utilisateur ou l’utilisatrice + doit être bloqué(e) sur l’API ? + tried_contacting: J’ai contacté l’utilisateur ou l’utilisatrice et lui ai demandé + d’arrêter. + tried_waiting: J’ai donné un temps raisonnable à l’utilisateur ou l’utilisatrice + pour répondre à ces messages. + needs_view: L’utilisateur ou l’utilisatrice doit se connecter avant que ce blocage + soit annulé back: Voir tous les blocages edit: - title: Modification d’un blocage sur « %{name} » - heading_html: Modification d’un blocage sur « %{name} » - reason: Raison pour laquelle « %{name} » est bloqué. Merci de rester aussi calme - et raisonnable que possible et de donner autant de détails que possible sur - la situation. Sachez que tout le monde ne comprend pas le jargon de la communauté, - alors utilisez des termes simples et précis. - period: Combien de temps, à partir de maintenant, l’utilisateur doit être bloqué - sur l’API ? + title: Modification d’un blocage sur « %{name} » + heading_html: Modification d’un blocage sur « %{name} » + reason: Raison pour laquelle « %{name} » est bloqué(e). Merci de rester aussi + calme et raisonnable que possible et de donner autant de détails que possible + sur la situation. Sachez que tout le monde ne comprend pas le jargon de la + communauté, alors utilisez des termes simples et précis. + period: Combien de temps, à partir de maintenant, l’utilisateur ou l’utilisatrice + doit être bloqué(e) sur l’API ? show: Afficher ce blocage back: Voir tous les blocages - needs_view: Est-ce que l’utilisateur doit se connecter avant que ce blocage - n’expire ? + needs_view: Est-ce que l’utilisateur ou l’utilisatrice doit se connecter avant + qu’expire ce blocage ? filter: block_expired: Le blocage a déjà expiré et ne peut pas être modifié. block_period: La période de blocage doit être choisie dans la liste déroulante. create: - try_contacting: Merci de contacter l’utilisateur avant de le bloquer et de lui - donner un temps raisonnable pour répondre. - try_waiting: Merci de donner un temps raisonnable à l’utilisateur avant de le - bloquer. - flash: Blocage créé sur l’utilisateur « %{name} ». + try_contacting: Merci de contacter l’utilisateur ou l’utilisatrice avant son + blocage et de lui donner un temps raisonnable pour répondre. + try_waiting: Merci de donner un temps raisonnable à l’utilisateur ou l’utilisatrice + avant son blocage. + flash: Blocage créé sur l’utilisateur « %{name} ». update: - only_creator_can_edit: Seul le modérateur qui a créé le blocage peut le modifier. + only_creator_can_edit: Seul le modérateur ou la modératrice qui a créé ce blocage + peut le modifier. success: Blocage mis à jour. index: - title: Blocages utilisateur + title: Blocages d’utilisateur heading: Liste des blocages empty: Aucun blocage n’a encore été effectué. revoke: - title: Révocation d’un blocage sur « %{block_on} » - heading_html: Révocation d’un blocage sur « %{block_on} » par « %{block_by} - » + title: Annulation d’un blocage sur « %{block_on} » + heading_html: Annulation d’un blocage sur « %{block_on} » par « %{block_by} » time_future: Ce blocage se terminera dans %{time}. - past: Ce blocage s’est terminé à %{time} et ne peut plus être révoqué. - confirm: Êtes-vous sûr de vouloir révoquer ce blocage ? - revoke: Révoquer ! - flash: Ce blocage a été révoqué. + past: Ce blocage s’est terminé à %{time} et ne peut plus être annulé. + confirm: Êtes-vous sûr de vouloir annuler ce blocage ? + revoke: Débloquer ! + flash: Ce blocage a été annulé. helper: time_future_html: Prends fin dans %{time}. until_login: Actif jusqu’à ce que l’utilisateur se connecte. @@ -2813,7 +2837,7 @@ fr: time_past_html: Terminé à %{time}. block_duration: hours: - one: '%{count} heure' + one: 1 heure other: '%{count} heures' days: one: 1 jour @@ -2826,31 +2850,32 @@ fr: one: 1 année other: '%{count} années' blocks_on: - title: Blocages de « %{name} » - heading_html: Liste des blocages sur « %{name} » - empty: « %{name} » n’a pas encore été bloqué. + title: Blocages de « %{name} » + heading_html: Liste des blocages sur « %{name} » + empty: « %{name} » n’a pas encore été bloqué. blocks_by: - title: Blocages effectués par « %{name} » - heading_html: Liste des blocages effectués par « %{name} » - empty: « %{name} » n’a pas encore effectué de blocages. + title: Blocages effectués par « %{name} » + heading_html: Liste des blocages effectués par « %{name} » + empty: « %{name} » n’a pas encore effectué de blocages. show: - title: « %{block_on} » bloqué par « %{block_by} » - heading_html: « %{block_on} » bloqué par « %{block_by} » + title: « %{block_on} » bloqué par « %{block_by} » + heading_html: « %{block_on} » bloqué par « %{block_by} » created: Créé status: État show: Afficher edit: Modifier - revoke: Révoquer ! - confirm: Êtes-vous sûr ? - reason: 'Raison du blocage :' + revoke: Révoquer ! + confirm: Êtes-vous sûr(e) ? + reason: 'Raison du blocage :' back: Afficher tous les blocages - revoker: 'Révocateur :' - needs_view: L’utilisateur doit se connecter avant que ce blocage soit supprimé. + revoker: 'Révocateur :' + needs_view: L’utilisateur ou l’utilisatrice doit se connecter avant que ce blocage + soit annulé. block: not_revoked: (non révoqué) show: Afficher edit: Modifier - revoke: Révoquer ! + revoke: Révoquer ! blocks: display_name: Utilisateur bloqué creator_name: Créateur @@ -2858,13 +2883,13 @@ fr: status: État revoker_name: Révoqué par showing_page: Page %{page} - next: Suivant » - previous: « Précédent + next: Suivant » + previous: « Précédent notes: index: - title: Notes soumises ou commentées par « %{user} » - heading: Notes de « %{user} » - subheading_html: Notes soumises ou commentées par « %{user} » + title: Notes soumises ou commentées par « %{user} » + heading: Notes de « %{user} » + subheading_html: Notes soumises ou commentées par « %{user} » id: Identifiant creator: Créateur description: Description @@ -2925,14 +2950,13 @@ fr: title: Couches copyright: © Contributeurs de OpenStreetMap donate_link_text: - terms: Conditions du site web et de l’API - thunderforest: Priorité des carreaux de Andy - Allan - opnvkarte: Tuiles obtenues grâce à l'amabilité de MeMoMaps - hotosm: Style des carreaux de l’équipe - humanitaire de OpenStreetMap hébergé par OpenStreetMap - France + terms: Conditions du site web et de l’API + thunderforest: Carreaux gracieusement fournis par Andy Allan + opnvkarte: Carreaux gracieusement fournis par MeMoMaps + hotosm: Style de carreaux pour l’Équipe + Humanitaire OpenStreetMap (HOT) hébergé par OpenStreetMap France site: edit_tooltip: Modifier la carte edit_disabled_tooltip: Zoomez en avant pour modifier la carte @@ -2951,12 +2975,12 @@ fr: unhide_comment: démasquer notes: new: - intro: Vous avez repéré une erreur ou un manque ? Faites-le savoir aux autres + intro: Vous avez repéré une erreur ou un manque ? Faites-le savoir aux autres cartographes afin qu’ils puissent y remédier. Déplacez le marqueur à la position exacte et écrivez une note pour expliquer le problème. advice: Votre note est publique et peut être utilisée pour mettre à jour la - carte, aussi n'entrez pas d'informations personnelles ou en provenance de - cartes protégées ni de contenus de répertoires. + carte, aussi n’entrez aucune information personnelle, ni aucune information + venant de cartes protégées, ni aucune entrée de répertoire ou d’annuaire. add: Ajouter une note show: anonymous_warning: Cette note comprend des commentaires d’utilisateurs anonymes, @@ -2982,17 +3006,16 @@ fr: distance: Distance errors: no_route: Impossible de trouver une route entre ces deux lieux. - no_place: Désolé, impossible de trouver '%{place}'. + no_place: Désolé, impossible de trouver « %{place} ». instructions: continue_without_exit: Continuez sur %{name} slight_right_without_exit: Tournez légèrement à droite sur %{name} offramp_right: Prendre la bretelle à droite - offramp_right_with_exit: Prendre la sortie %{exit} sur la droite - offramp_right_with_exit_name: Prendre la sortie %{exit} sur la droite vers - %{name} - offramp_right_with_exit_directions: Prendre la sortie %{exit} sur la droite - en direction de %{directions} - offramp_right_with_exit_name_directions: Prendre la sortie %{exit}à droite + offramp_right_with_exit: Prendre la sortie %{exit} à droite + offramp_right_with_exit_name: Prendre la sortie %{exit} à droite sur %{name} + offramp_right_with_exit_directions: Prendre la sortie %{exit} à droite vers + %{directions} + offramp_right_with_exit_name_directions: Prendre la sortie %{exit} à droite sur %{name}, vers %{directions} offramp_right_with_name: Prendre la bretelle à droite sur %{name} offramp_right_with_directions: Prendre la bretelle à droite vers %{directions} @@ -3006,21 +3029,20 @@ fr: onramp_right: Tourner à droite sur la bretelle endofroad_right_without_exit: À la fin de la route, tourner à droite sur %{name} merge_right_without_exit: Rejoindre à droite sur %{name} - fork_right_without_exit: À la bifurcation, tourner à droite sur %{name} + fork_right_without_exit: À l’embranchement, tourner à droite sur %{name} turn_right_without_exit: Tournez à droite sur %{name} sharp_right_without_exit: Tournez vivement à droite sur %{name} uturn_without_exit: Faites demi-tour sur %{name} sharp_left_without_exit: Tournez vivement à gauche sur %{name} turn_left_without_exit: Tournez à gauche sur %{name} offramp_left: Prendre la bretelle à gauche - offramp_left_with_exit: Prendre la sortie %{exit} sur la gauche - offramp_left_with_exit_name: Prendre la sortie %{exit} sur la gauche vers - %{name} - offramp_left_with_exit_directions: Prendre la sortie %{exit} sur la gauche - en direction de %{directions} - offramp_left_with_exit_name_directions: Prendre la sortie %{exit} sur la gauche - vers %{name}, en direction de %{directions} - offramp_left_with_name: Prendre la bretelle de gauche jusque %{name} + offramp_left_with_exit: Prendre la sortie %{exit} à gauche + offramp_left_with_exit_name: Prendre la sortie %{exit} à gauche sur %{name} + offramp_left_with_exit_directions: Prendre la sortie %{exit} à gauche vers + %{directions} + offramp_left_with_exit_name_directions: Prendre la sortie %{exit} à gauche + sur %{name}, vers %{directions} + offramp_left_with_name: Prendre la bretelle à gauche sur %{name} offramp_left_with_directions: Prendre la bretelle à gauche vers %{directions} offramp_left_with_name_directions: Prendre la bretelle à gauche sur %{name}, vers %{directions} @@ -3039,14 +3061,14 @@ fr: roundabout_without_exit: Au rond-point, prendre la sortie %{name} leave_roundabout_without_exit: Quittez le rond-point – %{name} stay_roundabout_without_exit: Restez sur le rond-point – %{name} - start_without_exit: Démarrez à %{name} + start_without_exit: Démarrez sur %{name} destination_without_exit: Atteignez la destination against_oneway_without_exit: Remontez à contre-sens sur %{name} end_oneway_without_exit: Fin du sens unique sur %{name} roundabout_with_exit: Au rond-point prendre la sortie %{exit} sur %{name} roundabout_with_exit_ordinal: Au rond-point prendre la sortie %{exit} sur %{name} - exit_roundabout: Sortir du rond-point vers %{name} + exit_roundabout: Sortir du rond-point sur %{name} unnamed: voie sans nom courtesy: Itinéraire fourni par %{link} exit_counts: @@ -3069,7 +3091,7 @@ fr: error: 'Erreur en contactant %{server} : %{error}' timeout: Délai dépassé en contactant %{server} context: - directions_from: Itinéraire depuis ici + directions_from: Itinéraire à partir d’ici directions_to: Itinéraire vers ici add_note: Ajouter une note ici show_address: Afficher l’adresse @@ -3089,13 +3111,13 @@ fr: heading: Saisissez les informations sur le nouveau masquage title: Création d’un nouveau masquage show: - description: 'Description :' - heading: Affichage du masquage « %{title} » + description: 'Description :' + heading: Affichage du masquage « %{title} » title: Affichage du masquage - user: 'Créateur :' + user: 'Créateur :' edit: Modifier ce masquage destroy: Supprimer ce masquage - confirm: Êtes-vous certain ? + confirm: Êtes-vous sûr(e) ? create: flash: Masquage créé. update: diff --git a/config/locales/fur.yml b/config/locales/fur.yml index f0946c938..2dfc900f1 100644 --- a/config/locales/fur.yml +++ b/config/locales/fur.yml @@ -102,15 +102,9 @@ fur: tagstring: separâts di virgulis editor: default: Predeterminât (par cumò %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (editôr tal sgarfadôr) id: name: iD description: iD (editôr tal sgarfadôr) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (editôr tal sgarfadôr) remote: name: Remote Control description: Remote Control (JOSM o Merkaartor) @@ -296,12 +290,7 @@ fur: new: title: Gnove vôs dal diari form: - subject: 'Sogjet:' - body: 'Cuarp:' - language: 'Lenghe:' location: 'Lûc:' - latitude: 'Latitudin:' - longitude: 'Longjitudin:' use_map_link: dopre mape index: title: Diaris dai utents @@ -734,7 +723,6 @@ fur: subject: '[OpenStreetMap] Benvignût in OpenStreetMap' email_confirm: subject: '[OpenStreetMap] Conferme la tô direzion di pueste eletroniche' - email_confirm_plain: click_the_link: Se tu sês propite tu, par plasê frache sul leam ca sot par confermâ il cambiament. note_comment_notification: @@ -839,15 +827,6 @@ fur: Tu puedis impuestâ come publics i tiei cambiaments de tô %{user_page}. user_page_link: pagjine dal utent anon_edits_link_text: Discuvierç parcè che al è cussì. - flash_player_required_html: Ti covente un riprodutôr Flash par doprâ Potlatch, - l'editôr Flash di OpenStreetMap. Tu puedis discjamâ - il Flash Player di Adobe.com. E - je cualchi altre opzion par lavorâ su OpenStreetMap. - potlatch_unsaved_changes: Tu âs cambiaments no salvâts. (Par salvâ in Potlatch, - tu varessis di deselezionâ il percors o il pont atuâl, se tu stâs lavorant - in modalitât live, o fracâ su Salve se tu viodis un boton Salve.) - potlatch2_unsaved_changes: Tu âs cambiaments no salvâts. (Par salvâ in Potlatch - 2, tu scugnis fracâ sul boton pal salvataç) no_iframe_support: Il to sgarfadôr nol supuarte i iframes HTML, che a coventin par cheste funzion. export: diff --git a/config/locales/ga.yml b/config/locales/ga.yml index dfc722525..d7f4faa67 100644 --- a/config/locales/ga.yml +++ b/config/locales/ga.yml @@ -102,15 +102,9 @@ ga: tagstring: teormharcáilte le camóga editor: default: Réamhshocraithe (%{name} faoi láthair) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (eagathóir sa bhrabhsálaí) id: name: iD description: iD (eagathóir sa bhrabhsálaí) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (eagathóir sa bhrabhsálaí) remote: name: Cianrialú description: Cianrialú (JOSM nó Merkaartor) @@ -295,12 +289,7 @@ ga: new: title: Iontráil Nua Dialainne form: - subject: 'Ábhar:' - body: 'Corp:' - language: 'Teanga:' location: 'Suíomh:' - latitude: 'Domhanleithead:' - longitude: 'Domhanfhad:' use_map_link: an léarscáil a úsáid index: title: Dialanna úsáideoirí @@ -1093,28 +1082,13 @@ ga: duit le go mbeidh tú in ann tosú amach. email_confirm: subject: '[OpenStreetMap] Do sheoladh ríomhphoist a dheimhniú' - email_confirm_plain: greeting: A chara, hopefully_you: Is mian le duit éigin (tusa, tá súil againn), a s(h)eoladh ríomhphoist ag %{server_url} a athrú go %{new_address}. click_the_link: Más tusa atá ann, cliceáil ar an nasc thíos chun an t-athrú a dheimhniú. - email_confirm_html: - greeting: A chara, - hopefully_you: Is mian le duit éigin (tusa, tá súil againn) a s(h)eoladh ríomhphoist - ag %{server_url} a athrú go %{new_address}. - click_the_link: Más tusa atá ann, cliceáil ar an nasc thíos chun an t-athrú - a dheimhniú. lost_password: subject: '[OpenStreetMap] Iarratas ar athshocrú pasfhocail' - lost_password_plain: - greeting: A chara, - hopefully_you: D'iarr duine éigin (tusa, b'fhéidir) go ndéanfaí an pasfhocal - a athshocrú ar an gcuntas openstreetmap.org atá ceangailte leis an seoladh - ríomhphoist seo. - click_the_link: Más tusa a bhí ann, cliceáil ar an nasc thíos chun do phasfhocal - a athshocrú. - lost_password_html: greeting: A chara, hopefully_you: D'iarr duine éigin (tusa, b'fhéidir) go ndéanfaí an pasfhocal a athshocrú ar an gcuntas openstreetmap.org atá ceangailte leis an seoladh @@ -1370,18 +1344,6 @@ ga: poiblí ar do %{user_page}. user_page_link: leathanach úsáideora anon_edits_link_text: Faigh amach cén fáth ar amhlaidh atá. - flash_player_required_html: Beidh seinnteoir Flash ag teastáil uait chun Potlatch, - eagarthóir Flash OpenStreetMap, a úsáid. Is féidir leat <Seinnteoir - Flash a íoslódáil ó Adobe.com. Tá - cúpla rogha eile ar fáil freisin chun eagarthóireacht a dhéanamh ar OpenStreetMap. - potlatch_unsaved_changes: Tá athruithe nár sábháladh déanta agat. (Chun sábháil - i bPotlatch, ba cheart duit an bealach nó poine reatha a dhíroghnú, má tá - tú i mbun eagarthóireachta sa mhód beo, nó cliceáil ar sábháil má tá cnaipe - sábhála le feiceáil). - potlatch2_not_configured: Níor cumraíodh Potlatch 2 - féach https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 - chun tuilleadh eolais a fháil - potlatch2_unsaved_changes: Tá athruithe nár sábháladh déanta agat. (Chun sábháil - a dhéanamh i bPotlatch2 , ba chóir duit cliceáil ar 'sábháil'. id_not_configured: Níor cumraíodh iD no_iframe_support: Ní thacaíonn do bhrabhsálaí leis an ngné 'iframe' de chuid HTML, rud atá riachtanach don ghné seo. diff --git a/config/locales/gd.yml b/config/locales/gd.yml index be67f55ec..9cafc50c9 100644 --- a/config/locales/gd.yml +++ b/config/locales/gd.yml @@ -115,15 +115,9 @@ gd: with_name_html: '%{name} (%{id})' editor: default: Bun-roghainn (%{name} an-dràsta) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (deasaiche am broinn a' bhrabhsair) id: name: iD description: iD (deasaiche am broinn a' bhrabhsair) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (deasaiche am broinn a' bhrabhsair) remote: name: Inneal-smachd cèin description: Inneal-smachd cèin (JOSM no Merkaartor) @@ -326,12 +320,7 @@ gd: new: title: Clàr ùr an leabhair-latha form: - subject: 'Cuspair:' - body: 'Bodhaig:' - language: 'Cànan:' location: 'Àite:' - latitude: 'Domhan-leud:' - longitude: 'Domhan-fhad:' use_map_link: cleachd mapa index: title: Leabhraichean-latha @@ -975,7 +964,6 @@ gd: beachd agad fhèin a chur ris air %{commenturl} no freagairt a sgrìobhadh air %{replyurl}' message_notification: - subject_header: '[OpenStreetMap] %{subject}' hi: Shin thu, %{to_user}, header: 'Chuir %{from_user} teachdaireachd thugad slighe OpenStreetMap air a bheil an cuspair "%{subject}":' @@ -1009,13 +997,6 @@ gd: fiosrachaidh dhut ach am bi e nas fhasa dhut tòiseachadh. email_confirm: subject: '[OpenStreetMap] Dearbhaich an seòladh puist-d agad' - email_confirm_plain: - greeting: Shin thu, - hopefully_you: Tha cuideigin (an dòchas gur e tusa a th' ann) airson an seòladh - puist-d agad atharrachadh gu %{new_address} air %{server_url}. - click_the_link: Mas e tusa a th' ann, briog air a' cheangal gu h-ìosal gus an - atharrachadh a dhearbhadh. - email_confirm_html: greeting: Shin thu, hopefully_you: Tha cuideigin (an dòchas gur e tusa a th' ann) airson an seòladh puist-d agad atharrachadh gu %{new_address} air %{server_url}. @@ -1023,14 +1004,6 @@ gd: atharrachadh a dhearbhadh. lost_password: subject: '[OpenStreetMap] Chaidh ath-shuidheachadh air facal-faire iarraidh' - lost_password_plain: - greeting: Shin thu, - hopefully_you: Dh'iarr cuideigin (an dòchas gur e tusa a bh' ann) gun dèid am - facal-faire agad atharrachadh airson cunntas an t-seòlaidh phuist-d seo air - openstreetmap.org. - click_the_link: Mas e tusa a bh' ann, briog air a' cheangal gu h-ìosal gus am - facal-faire agad ath-shuidheachadh. - lost_password_html: greeting: Shin thu, hopefully_you: Dh'iarr cuideigin (an dòchas gur e tusa a bh' ann) gun dèid am facal-faire agad atharrachadh airson cunntas an t-seòlaidh phuist-d seo air @@ -1323,19 +1296,6 @@ gd: user_page_link: duilleag a' chleachdaiche anon_edits_html: (%{link}) anon_edits_link_text: Faigh a-mach carson - flash_player_required_html: Bidh feum agad air cluicheadair Flash gus an deasaiche - Flash OpenStreetMap air a bheil Potlatch a chleachdadh. 'S urrainn dhut Flash - Player a luchadh a-nuas o Adobe.com. Tha roghainnean - eile ri làimh cuideachd gus OpenStreetMap a dheasachadh. - potlatch_unsaved_changes: Tha atharrachadh gun sàbhaladh agad. (airson sàbhaladh - ann am Potlatch, bu chòir dhut a' phuing no slighe làithreach a dhì-thaghadh - ma tha thu 'ga deasachadh sa mhodh bheò no briog air "Sàbhail" ma tha putan - sàbhalaidh agad.) - potlatch2_not_configured: Cha deach Potlatch 2 a rèiteachadh - tadhail air http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 - airson barrachd fiosrachaidh - potlatch2_unsaved_changes: Tha atharrachadh gun sàbhaladh agad. (Gus sàbhaladh - ann am 2, bu chòir dhut briogadh air "Sàbhail".) id_not_configured: Cha deach iD a rèiteachadh no_iframe_support: Cha toir am brabhsair agad taic ri HTML iframes a tha riatanach airson an fhearta seo. diff --git a/config/locales/gl.yml b/config/locales/gl.yml index a6ebcc9ae..f6fdb9c9a 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -188,15 +188,9 @@ gl: with_name_html: '%{name} (%{id})' editor: default: Predeterminado (actualmente, %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (editor integrado no navegador) id: name: iD description: iD (editor integrado no navegador) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (editor integrado no navegador) remote: name: Control remoto description: Control remoto (JOSM ou Merkaartor) @@ -421,12 +415,7 @@ gl: new: title: Nova entrada no diario form: - subject: 'Asunto:' - body: 'Corpo:' - language: 'Lingua:' location: 'Localización:' - latitude: 'Latitude:' - longitude: 'Lonxitude:' use_map_link: empregar mapa index: title: Diarios dos usuarios @@ -1447,7 +1436,6 @@ gl: footer: Tamén podes ler o comentario en %{readurl} e comentar en %{commenturl} ou enviar unha mensaxe ó autor en %{replyurl} message_notification: - subject_header: '[OpenStreetMap] %{subject}' hi: 'Ola %{to_user}:' header: '%{from_user} envioulle unha mensaxe a través do OpenStreetMap co asunto "%{subject}":' @@ -1478,25 +1466,12 @@ gl: adicional coma axuda para comezar. email_confirm: subject: '[OpenStreetMap] Confirma o teu enderezo de correo electrónico' - email_confirm_plain: - greeting: 'Ola:' - hopefully_you: Alguén (se cadra ti) quere mudar o teu enderezo de correo electrónico - en %{server_url} a %{new_address}. - click_the_link: Se este es ti, preme na seguinte ligazón para confirmar a modificación. - email_confirm_html: greeting: 'Ola:' hopefully_you: Alguén (se cadra ti) quere mudar o teu enderezo de correo electrónico en %{server_url} a %{new_address}. click_the_link: Se este es ti, preme na seguinte ligazón para confirmar a modificación. lost_password: subject: '[OpenStreetMap] Solicitude de restablecemento do contrasinal' - lost_password_plain: - greeting: 'Ola:' - hopefully_you: Alguén (se cadra ti) pediu o restabelecemento do contrasinal - desta conta de correo electrónico en openstreetmap.org. - click_the_link: Se este es ti, preme na seguinte ligazón para restabelecer o - teu contrasinal. - lost_password_html: greeting: 'Ola:' hopefully_you: Alguén (se cadra ti) pediu o restabelecemento do contrasinal desta conta de correo electrónico en openstreetmap.org. @@ -1820,17 +1795,6 @@ gl: user_page_link: páxina de usuario anon_edits_html: (%{link}) anon_edits_link_text: Descobra velaquí o motivo. - flash_player_required_html: Precisa un reprodutor Flash para empregar o Potlatch, - o editor Flash do OpenStreetMap. Pode baixar - o Flash do sitio Adobe.com. Tamén - están dispoñíbeis outras opcións para editar o OpenStreetMap. - potlatch_unsaved_changes: Tes modificacións sen gardar. (Para gardalas no Potlatch - tes que deseleccionar a vía actual, o punto se está a editar no modo ao vivo - ou premer sobre o botón de "Gardar".) - potlatch2_not_configured: O Potlatch 2 non está configurado; consulte https://wiki.openstreetmap.org/wiki/The_Rails_Port - para obter máis información - potlatch2_unsaved_changes: Tes modificacións sen gardar. (Para gardar no Potlatch - 2, preme en "Gardar".) id_not_configured: O iD non está configurado no_iframe_support: O teu navegador non soporta os iframes HTML, necesarios para este elemento. diff --git a/config/locales/he.yml b/config/locales/he.yml index 83a59e095..9c96905f0 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -25,6 +25,7 @@ # Author: YaronSh # Author: Yona b # Author: Ypnypn +# Author: Zstadler # Author: יאיר מן # Author: ישראל קלר # Author: נדב ס @@ -54,8 +55,8 @@ he: create: רישום update: עדכון redaction: - create: יצירת חיתוך - update: שמירת חיתוך + create: יצירת הסרה + update: שמירת הסרה trace: create: העלאה update: שמירת שינויים @@ -66,7 +67,7 @@ he: errors: messages: invalid_email_address: זאת אינה כתובת דוא״ל תקנית - email_address_not_routable: אין אפשרות לטוות מסלול + email_address_not_routable: אי אפשר ליצור נתיב models: acl: רשימת בקרת גישה changeset: ערכת שינויים @@ -75,46 +76,46 @@ he: diary_comment: תגובה ליומן diary_entry: רשומה ביומן friend: חבר - issue: סוגיה + issue: דיווח language: שפה message: הודעה node: נקודה - node_tag: תג מפרק - notifier: מודיע + node_tag: תג של נקודה + notifier: מתריע old_node: נקודה ישנה - old_node_tag: תג מפרק ישן + old_node_tag: תג של נקודה ישנה old_relation: יחס ישן old_relation_member: איבר יחס ישן old_relation_tag: תג יחס ישן - old_way: דרך ישנה - old_way_node: נקודת דרך ישנה - old_way_tag: תג דרך ישנה + old_way: קו ישן + old_way_node: נקודת קו ישנה + old_way_tag: תג קו ישן relation: יחס relation_member: איבר יחס relation_tag: תג יחס - report: דיווח + report: דוח session: שיח - trace: מסלול - tracepoint: נקודת מסלול - tracetag: תג מסלול + trace: הקלטה + tracepoint: נקודת הקלטה + tracetag: תג הקלטה user: משתמש - user_preference: העדפת המשתמש + user_preference: העדפות משתמש user_token: אסימון משתמש - way: דרך - way_node: נקודת דרך - way_tag: תג דרך + way: קו + way_node: נקודה של קו + way_tag: תג קו attributes: client_application: name: שם (נדרש) url: כתובת יישום ראשית (נדרש) - callback_url: כתובת קריאה (callback) + callback_url: כתובת קריאה חוזרת (callback) support_url: כתובת לתמיכה allow_read_prefs: לקרוא את העדפות המשתמש שלהם allow_write_prefs: לשנות את העדפות המשתמש שלהם allow_write_diary: ליצור רשומות ביומן, הערות וליצור חברויות allow_write_api: לשנות את המפה - allow_read_gpx: לקרוא את מסלולי ה־GPS הפרטיים שלהם - allow_write_gpx: להעלות מסלולי GPS + allow_read_gpx: לקרוא את הקלטות ה־GPS הפרטיות שלהם + allow_write_gpx: להעלות הקלטות GPS allow_write_notes: לשנות הערות diary_comment: body: גוף @@ -138,7 +139,7 @@ he: description: תיאור gpx_file: העלאת קובץ GPX visibility: נִראוּת - tagstring: תגיות + tagstring: תגים message: sender: שולח title: נושא @@ -146,7 +147,7 @@ he: recipient: נמען report: category: נא לבחור את הסיבה לדיווח שלך - details: נא לספק פרטים על הבעיה (נדרש). + details: נא לספק פרטים נוספים על הבעיה (נדרש). user: email: דוא״ל active: פעיל @@ -154,71 +155,80 @@ he: description: תיאור languages: שפות pass_crypt: סיסמה - pass_crypt_confirmation: אימות ססמה + pass_crypt_confirmation: אימות סיסמה help: trace: tagstring: מופרד בפסיקים datetime: distance_in_words_ago: about_x_hours: - one: לפני בערך שעה - two: לפני בערך שעתיים - many: לפני בערך %{count} שעות - other: לפני בערך %{count} שעות + one: לפני שעה בערך + two: לפני שעתיים בערך + many: לפני %{count} שעות בערך + other: לפני %{count} שעות בערך about_x_months: - one: לפני בערך חודש - two: לפני בערך חודשיים - other: לפני בערך %{count} חודשים + one: לפני חודש בערך + two: לפני חודשיים בערך + many: לפני %{count} חודשים בערך + other: לפני %{count} חודשים בערך about_x_years: - one: לפני בערך שנה - two: לפני בערך שנתיים - other: לפני בערך %{count} שנים + one: לפני שנה בערך + two: לפני שנתיים בערך + many: לפני %{count} שנים בערך + other: לפני %{count} שנים בערך almost_x_years: one: לפני כמעט שנה two: לפני כמעט שנתיים + many: לפני כמעט %{count} שנים other: לפני כמעט %{count} שנים half_a_minute: לפני חצי דקה less_than_x_seconds: one: לפני פחות משנייה + two: לפני פחות מ־%{count} שניות + many: לפני פחות מ־%{count} שניות other: לפני פחות מ־%{count} שניות less_than_x_minutes: one: לפני פחות מדקה + two: לפני פחות מ־%{count} דקות + many: לפני פחות מ־%{count} דקות other: לפני פחות מ־%{count} דקות over_x_years: one: לפני למעלה משנה two: לפני למעלה משנתיים + many: לפני למעלה מ־%{count} שנים other: לפני למעלה מ־%{count} שנים x_seconds: one: לפני שנייה + two: לפני %{count} שניות + many: לפני %{count} שניות other: לפני %{count} שניות x_minutes: one: לפני דקה + two: לפני %{count} דקות + many: לפני %{count} דקות other: לפני %{count} דקות x_days: one: אתמול two: שלשום + many: לפני %{count} ימים other: לפני %{count} ימים x_months: one: לפני חודש two: לפני חודשיים + many: לפני %{count} חודשים other: לפני %{count} חודשים x_years: one: לפני שנה two: לפני שנתיים - other: לפני בערך %{count} שנים + many: לפני %{count} שנים + other: לפני %{count} שנים printable_name: with_name_html: '%{name} (%{id})' editor: default: ברירת מחדל (כעת %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (עורך בתוך הדפדפן) id: name: iD description: iD (עורך בתוך הדפדפן) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (עורך בתוך הדפדפן) remote: name: שליטה מרחוק description: שליטה מרחוק (JOSM או Merkaartor) @@ -229,7 +239,7 @@ he: google: גוגל facebook: פייסבוק windowslive: Windows Live - github: GitHub + github: גיטהאב wikipedia: ויקיפדיה api: notes: @@ -244,12 +254,12 @@ he: reopened_at_by_html: הופעלה מחדש %{when} על־ידי %{user} rss: title: הערות של OpenStreetMap - description_area: רשימת הערות שהוספו, שהתקבלו עליהן הערות ושנדבגרו באזור שלך + description_area: רשימת הערות שהוספו, שהתקבלו עליהן הערות ושנפתרו באזור שלך [(%{min_lat}|%{min_lon}) – (%{max_lat}|%{max_lon})] description_item: הזנת rss עבור ההערה %{id} opened: הערה חדשה (ליד %{place}) commented: תגובה חדשה (ליד %{place}) - closed: הערה סגורה (ליד %{place}) + closed: הערה פתורה (ליד %{place}) reopened: הערה שהופעלה מחדש (ליד %{place}) entry: comment: תגובה @@ -286,15 +296,15 @@ he: title: 'ערכת שינויים: %{id}' belongs_to: יוצר node: נקודות (%{count}) - node_paginated: מפרקים (%{x}–%{y} מתוך %{count}) - way: דרכים (%{count}) - way_paginated: דרכים (%{x}–%{y} מתוך %{count}) + node_paginated: נקודות (%{x}–%{y} מתוך %{count}) + way: קווים (%{count}) + way_paginated: קווים (%{x}–%{y} מתוך %{count}) relation: יחסים (%{count}) relation_paginated: יחסים (%{x}–%{y} מתוך %{count}) comment: הערות (%{count}) hidden_commented_by_html: הערה מוסתרת ממשתמש %{user} %{when} commented_by_html: הערה ממשתמש %{user} %{when} - changesetxml: XML של ערכת שינויים + changesetxml: XML של ערכת השינויים osmchangexml: osmChange XML feed: title: ערכת שינויים %{id} @@ -304,10 +314,10 @@ he: still_open: ערכת השינויים עדיין פתוחה – הדיון ייפתח אחרי שערכת השיניים תיסגר. node: title_html: 'נקודה: %{name}' - history_title_html: 'היסטוריית הצומת: %{name}' + history_title_html: 'היסטוריית הנקודה: %{name}' way: - title_html: 'דרך: %{name}' - history_title_html: 'היסטוריית הדרך: %{name}' + title_html: 'קו: %{name}' + history_title_html: 'היסטוריית הקו: %{name}' nodes: נקודות nodes_count: one: נקודה אחת @@ -315,7 +325,9 @@ he: many: '%{count} נקודות' other: '%{count} נקודות' also_part_of_html: - one: חלק מדרך %{related_ways} + one: חלק מקו%{related_ways} + two: חלק מהדרכים %{related_ways} + many: חלק מהדרכים %{related_ways} other: חלק מהדרכים %{related_ways} relation: title_html: 'יחס: %{name}' @@ -330,33 +342,32 @@ he: entry_role_html: '%{type} %{name} בתור %{role}' type: node: נקודה - way: דרך + way: קו relation: יחס containing_relation: entry_html: יחס %{relation_name} entry_role_html: יחס %{relation_name} (בתור %{relation_role}) not_found: title: לא נמצא - sorry: אנו מתנצלים, אך הסוג %{type} בעל המזהה %{id} לא נמצא. + sorry: אנו מתנצלים, אך לא מצאנו %{type} מספר %{id}. type: node: נקודה - way: דרך + way: קו relation: יחס changeset: ערכת שינויים note: הערה timeout: title: שגיאת זמן מוקצב - sorry: אנו מתנצלים, אך טעינת התוכן עבור ה%{type} עם המזהה %{id}, ארכה זמן רב - מדי. + sorry: אנו מתנצלים, אך טעינת המידע עבור %{type} מספר %{id}, ארכה זמן רב מדי. type: node: נקודה - way: דרך + way: קו relation: קשר changeset: ערכת שינויים note: הערה redacted: - redaction: חיתוך %{id} - message_html: 'לא ניתן להציג את הגרסה %{version} של %{type} מכיוון שהיא נחתכה. + redaction: הסרה %{id} + message_html: 'לא ניתן להציג את הגרסה %{version} של %{type} מכיוון שהיא הוסרה. למידע נוסף: %{redaction_link}.' type: node: נקודה @@ -398,7 +409,7 @@ he: title: שאילתת ישויות introduction: יש ללחוץ עלהמפה כדי למצוא ישויות בסביבה. nearby: ישויות בסביבה - enclosing: ישויות סובבות + enclosing: ישויות מכילות changesets: changeset_paging_nav: showing_page: הדף %{page} @@ -410,7 +421,7 @@ he: view_changeset_details: הצגת פרטי ערכת שינויים changesets: id: מזהה - saved_at: נשמרו תחת + saved_at: נשמרו ב user: משתמש comment: הערה area: שטח @@ -444,12 +455,7 @@ he: new: title: רשומת יומן חדשה form: - subject: 'נושא:' - body: 'תוכן:' - language: 'שפה:' - location: 'מיקום:' - latitude: 'קו רוחב:' - longitude: 'קו אורך:' + location: מיקום use_map_link: להשתמש במפה index: title: יומנים של המשתמש @@ -479,7 +485,8 @@ he: body: עדיין אין רשומת יומן או תגובה עם המזהה %{id}. אולי האיות לא נכון ואולי לחצת על קישור שגוי, עמך הסליחה. diary_entry: - posted_by_html: פורסם על־ידי %{link_user} ב־%{created} ב%{language_link} + posted_by_html: פורסם על־ידי %{link_user} ב־%{created} ב%{language_link}. + updated_at_html: עודכן לאחרונה ב־%{updated}. comment_link: הערות לרשומה הזאת reply_link: שליחת תגובה למחבר comment_count: @@ -523,13 +530,13 @@ he: heading: להוסיף את %{user} בתור חבר? button: להוסיף כחבר success: '%{name} חבר שלך עכשיו!' - failed: סליחה, הוספת %{name} כחבר נכשלה. + failed: מצטערים, הוספת %{name} כחבר נכשלה. already_a_friend: '%{name} כבר חבר שלך.' remove_friend: heading: להסיר את %{user} מרשימת החברים? button: להסיר מרשימת החברים success: '%{name} הוסר מרשימת החברים שלך.' - not_a_friend: '%{name} לא אחד מהחברים שלך.' + not_a_friend: '%{name} אינו אחד מהחברים שלך.' geocoder: search: title: @@ -547,29 +554,30 @@ he: cable_car: רכבל chair_lift: מעלית סקי בישיבה drag_lift: מעלית סקי בגרירה - gondola: רכבל גונדולה + gondola: רכבל magic_carpet: מסוע סקי - platter: מעלית צלחת - pylon: פילון + platter: מעלית סקי בגרירת צלחת + pylon: עמוד רכבל station: תחנת רכבל - t-bar: מעלית טי־בר - "yes": אווירי + t-bar: מעלית סקי טי־בר + "yes": רכבל כללי aeroway: - aerodrome: מנחת + aerodrome: שדה תעופה airstrip: מִנחת - apron: רחבת חניה + apron: רחבת חניית מטוסים gate: שער hangar: מוסך מטוסים helipad: מנחת מסוקים holding_position: מיקום החזקה navigationaid: עזר ניווט אווירי - parking_position: מיקום חניה + parking_position: עמדת חניה runway: מסלול המראה - taxiway: מסלול נסיעת מטוס + taxilane: נתיב הסעה + taxiway: מסלול הסעה terminal: מסוף windsock: שרוול רוח amenity: - animal_boarding: פנסיון + animal_boarding: פנסיון לחיות animal_shelter: בית מחסה לחיות arts_centre: מרכז אמנויות atm: כספומט @@ -610,32 +618,32 @@ he: fast_food: מזון מהיר ferry_terminal: מסוף מעבורת fire_station: תחנת כיבוי אש - food_court: אזור מזון מהיר + food_court: מתחם מזון מהיר fountain: מזרקה fuel: דלק gambling: הימורים grave_yard: בית קברות - grit_bin: grit bin + grit_bin: ארגז חול לכביש hospital: בית חולים - hunting_stand: תצפית ציידים + hunting_stand: עמדת ציידים ice_cream: גלידה - internet_cafe: אינטרנט קפה + internet_cafe: קפה אינטרנט kindergarten: גן ילדים language_school: בית ספר לשפות library: ספרייה - loading_dock: רציף תפעולי + loading_dock: רציף העמסה love_hotel: מלון אהבה marketplace: שוק - mobile_money_agent: סוכני בנקאות מרוחקים + mobile_money_agent: סוכן תשלומים בנייד monastery: מנזר - money_transfer: העברת כסף + money_transfer: העברת כספים motorcycle_parking: חניית אופנועים music_school: בית ספר למוזיקה nightclub: מועדון לילה nursing_home: בית אבות parking: חניה parking_entrance: כניסה לחניה - parking_space: חלל חניה + parking_space: עמדת חניה payment_terminal: מסוף תשלום pharmacy: בית מרקחת place_of_worship: מקום פולחן @@ -644,10 +652,10 @@ he: post_office: סניף דואר prison: כלא pub: פאב - public_bath: מקלחת ציבורית + public_bath: מרחץ ציבורי public_bookcase: ספרייה זעירה public_building: מבנה ציבור - ranger_station: תחנת הפקחים + ranger_station: תחנת פקחים recycling: נקודת מיחזור restaurant: מסעדה sanitary_dump_station: תחנת ריקון פסולת @@ -655,7 +663,7 @@ he: shelter: מחסה shower: מקלחת social_centre: מרכז חברתי - social_facility: מתקן חברתי + social_facility: שירותים חברתיים studio: סטודיו swimming_pool: ברֵכת שחייה taxi: מונית @@ -668,10 +676,10 @@ he: vehicle_inspection: בדיקת כלי רכב vending_machine: מכונת מכירה veterinary: מרפאה וטרינרית - village_hall: אולם הכפר + village_hall: בית העם waste_basket: פח אשפה waste_disposal: טיפול בפסולת - waste_dump_site: אתר השלכת פסולת + waste_dump_site: אתר איסוף פסולת watering_place: שוקת water_point: נקודת מים weighbridge: מאזני גשר @@ -681,58 +689,58 @@ he: administrative: גבול שטח שיפוט census: גבול מפקד אוכלוסין national_park: פארק לאומי - political: גבול אזורי בחירה + political: גבול אזור בחירה protected_area: אזור מוגן "yes": גבול bridge: aqueduct: אמת מים - boardwalk: מדרכה + boardwalk: שביל צף suspension: גשר תלוי swing: גשר סובב - viaduct: אובל + viaduct: גשר עמודים "yes": גשר building: apartment: דירה - apartments: מתחם דירות + apartments: בית דירות barn: אסם bungalow: בונגלו cabin: בקתה chapel: קפלה church: בניין כנסייה - civic: בניין אזרחי + civic: בניין ציבורי college: בניין מכללה commercial: בניין מסחרי construction: בניין בבנייה detached: בית פרטי dormitory: מעונות - duplex: דירת דופלקס + duplex: בית דופלקס farm: בית חווה - farm_auxiliary: בית חווה בלי תושבים - garage: מוסך - garages: מתחם מחסנים + farm_auxiliary: בניין לא מיושב בחווה + garage: חניה + garages: חניות greenhouse: חממה hangar: הנגאר hospital: בית חולים hotel: בניין מלון house: בית - houseboat: בית על סירה + houseboat: בית סירה hut: צריף industrial: בניין תעשייתי kindergarten: מבנה גן ילדים - manufacture: בניין תעשייה + manufacture: מבנה תעשייה office: בניין משרדים public: בניין ציבורי residential: בניין מגורים - retail: בניין מסחרי + retail: מבנה מסחרי roof: גג - ruins: בניין הרוס + ruins: חורבה school: בית ספר semidetached_house: דו־משפחתי service: בניין שירות - shed: מחסה + shed: צריף stable: אורווה static_caravan: קרוואן - temple: בניין מקדש + temple: מקדש terrace: בניין מדורג train_station: בניין תחנת רכבת university: אוניברסיטה @@ -756,8 +764,8 @@ he: glaziery: זגג handicraft: מלאכת יד hvac: תכנון מיזוג אוויר - metal_construction: ספק מתכת - painter: צייר + metal_construction: ברזל בניין + painter: צַבָּע photographer: צלם plumber: שרברב roofer: גגן @@ -772,10 +780,10 @@ he: access_point: נקודת גישה ambulance_station: תחנת אמבולנסים assembly_point: נקודת התאספות - defibrillator: מפעם + defibrillator: מפעם (דפיברילטור) fire_xtinguisher: מטפה fire_water_pond: מאגר מים לכיבוי אש - landing_site: אתר נחיתת חירום + landing_site: אתר נחיתה בחירום life_ring: גלגל הצלה phone: טלפון חירום siren: צופר חירום @@ -785,35 +793,35 @@ he: highway: abandoned: כביש נטוש bridleway: שביל עבור סוסים - bus_guideway: נתיב תחבורה ציבורית מונחית + bus_guideway: נתיב תחבורה ציבורית מודרכת bus_stop: תחנת אוטובוס - construction: כביש מהיר בבנייה + construction: דרך בבנייה corridor: פרוזדור cycleway: נתיב אופניים elevator: מעלית - emergency_access_point: נקודת גישה לשירותי חירום + emergency_access_point: נקודת ציון לחירום emergency_bay: מפרץ בטיחות - footway: שביל להולכי רגל - ford: מעברה בנחל - give_way: תמרור תן זכות קדימה - living_street: רחוב מגורים + footway: נתיב להולכי רגל + ford: גשר אירי + give_way: תמרור מתן זכות קדימה + living_street: רחוב הולנדי milestone: אבן דרך - motorway: כביש - motorway_junction: צומת כבישים - motorway_link: כביש מכוניות - passing_place: מיקום חולף - path: נתיב - pedestrian: דרך להולכי רגל - platform: פלטפורמה + motorway: כביש מהיר + motorway_junction: צומת דרכים + motorway_link: חיבור לכביש מהיר + passing_place: מפרץ מעבר + path: שביל + pedestrian: מדרחוב + platform: רציף primary: דרך ראשית - primary_link: דרך ראשית + primary_link: חיבור לדרך ראשית proposed: דרך מוצעת raceway: מסלול מרוצים residential: דרך באזור מגורים rest_area: אזור מנוחה road: דרך secondary: דרך משנית - secondary_link: דרך משנית + secondary_link: חיבור לדרך משנית service: כביש שירות services: שירותי דרך speed_camera: מצלמת מהירות @@ -821,66 +829,67 @@ he: stop: תמרור עצור street_lamp: פנס רחוב tertiary: דרך שלישונית - tertiary_link: דרך שלישונית + tertiary_link: חיבור לדרך שלישונית track: דרך עפר traffic_mirror: מראה פנורמית traffic_signals: רמזור trailhead: שלט תחילת מסלול - trunk: דרך ראשית - trunk_link: דרך ראשית + trunk: דרך עיקרית + trunk_link: חיבור לדרך עיקרית turning_loop: מעגל תנועה unclassified: דרך לא מסווגת "yes": דרך historic: aircraft: כלי טיס היסטורי archaeological_site: אתר ארכאולוגי - bomb_crater: מכתש היסטורי מפצצה + bomb_crater: מכתש הפצצה היסטורי battlefield: שדה קרב - boundary_stone: אבן גבול + boundary_stone: אבן גבול היסטורית building: בניין היסטורי - bunker: בונקר + bunker: בונקר היסטורי cannon: תותח היסטורי - castle: טירה + castle: טירה היסטורית charcoal_pile: ערימת פחם היסטורית - church: כנסייה - city_gate: שער העיר - citywalls: חומות העיר - fort: מעוז + church: כנסייה היסטורית + city_gate: שער עיר היסטורי + citywalls: חומות עיר היסטוריות + fort: מצודה היסטורית heritage: אתר מורשת - house: בית - manor: אחוזה - memorial: אנדרטה זיכרון - milestone: נקודת ציון היסטורית - mine: מכרה - mine_shaft: פיר מכרה - monument: אנדרטה + hollow_way: דרך ששקעה + house: בית היסטורי + manor: אחוזה היסטורית + memorial: אנדרטת זיכרון + milestone: אבן דרך היסטורית + mine: מכרה היסטורי + mine_shaft: פיר מכרה היסטורי + monument: אתר הנצחה railway: מסילת רכבת היסטורית roman_road: דרך רומית - ruins: הריסות - stone: אבן + ruins: חורבה + stone: אבן היסטורית tomb: קבר - tower: מגדל - wayside_chapel: קפלה בצד הדרך - wayside_cross: צלב בצד הדרך - wayside_shrine: מקדש בצד הדרך + tower: מגדל היסטורי + wayside_chapel: קפלת דרכים היסטורית + wayside_cross: צלב היסטורי בצד הדרך + wayside_shrine: מקדש היסטורי בצד הדרך wreck: ספינה טרופה "yes": אתר היסטורי junction: "yes": צומת landuse: - allotments: הקצאת קרקע + allotments: חלקת גינה aquaculture: חקלאות ימית - basin: אגן + basin: מאגר brownfield: אזור תעשייה נטוש cemetery: בית קברות commercial: אזור מסחרי - conservation: שמורה + conservation: אזור לשימור construction: אזור בנייה farm: חווה farmland: שטח חקלאי - farmyard: חצר חווה + farmyard: חצר חקלאית forest: יער - garages: מוסכים + garages: מחסנים grass: דשא greenfield: שטחים ירוקים industrial: אזור תעשייה @@ -888,16 +897,16 @@ he: meadow: אחו military: שטח צבאי mine: מכרה - orchard: פרדס + orchard: מטע plant_nursery: משתלה quarry: מחצבה railway: מסילת ברזל - recreation_ground: שטחי נופש ופנאי + recreation_ground: שטח נופש ופנאי religious: מתחם דתי reservoir: מאגר - reservoir_watershed: פרשת מים של מאגר + reservoir_watershed: אגן ניקוז של מאגר residential: אזור מגורים - retail: קמעונאי + retail: איזור מסחרי village_green: כיכר הכפר vineyard: כרם "yes": שימוש בקרקע @@ -906,20 +915,20 @@ he: amusement_arcade: משחקייה bandstand: בימת תזמורת beach_resort: אתר נופש לחוף ים - bird_hide: מצפור + bird_hide: מצפה ציפורים bleachers: טריבונה - bowling_alley: מסלול באולינג + bowling_alley: באולינג common: שטח משותף dance: מתחם ריקודים dog_park: פארק כלבים - firepit: בור אש + firepit: מקום מוסדר למדורה fishing: אזור דיג fitness_centre: מכון כושר fitness_station: תחנת כושר garden: גן golf_course: מגרש גולף - horse_riding: רכיבת סוסים - ice_rink: גלישה על הקרח + horse_riding: רכיבה על סוסים + ice_rink: החלקה על הקרח marina: מרינה miniature_golf: מיני־גולף nature_reserve: שמורת טבע @@ -939,7 +948,7 @@ he: water_park: פארק מים "yes": נופש man_made: - adit: כניסה אופקית למערה + adit: פתח מכרה advertising: פרסום antenna: אנטנה avalanche_protection: הגנה מפני מפולות @@ -951,23 +960,23 @@ he: bunker_silo: בונקר cairn: גלעד chimney: ארובה - clearcut: כריתה מלאה - communications_tower: עמוד תקשורת - crane: עגורן + clearcut: קרחת יער + communications_tower: מגדל תקשורת + crane: מנוף cross: צלב - dolphin: עמוד רתיקה - dyke: מרבג - embankment: סוללה + dolphin: עמוד רתיקה לכלי שייט + dyke: סוללת הגנה מפני הצפות + embankment: סוללה לדרך או מסילה flagpole: תורן gasometer: גזומטר - groyne: רציף - kiln: פורנס + groyne: מחסום לעצירת סחף + kiln: כבשן lighthouse: מגדלור - manhole: כוות כניסה + manhole: מכסה בור תת־קרקעי mast: תורן mine: מכרה mineshaft: פיר מכרה - monitoring_station: תחנת מעקב + monitoring_station: תחנת ניטור petroleum_well: באר נפט pier: רציף pipeline: קו צינורות @@ -981,8 +990,8 @@ he: surveillance: מעקב telescope: טלסקופ tower: מגדל - utility_pole: עמוד חשמל - wastewater_plant: מפעל טיהור מים + utility_pole: עמוד חשמל או טלפון + wastewater_plant: מפעל טיפול בשפכים watermill: טחנת מים water_tap: ברז מים water_tower: מגדל מים @@ -995,11 +1004,11 @@ he: airfield: מנחת צבאי barracks: מגורי חיילים bunker: בונקר - checkpoint: נקודת בקרה + checkpoint: מעבר בדיקה trench: שוחה "yes": צבאי mountain_pass: - "yes": מעבר הררי + "yes": מעבר הרים natural: bare_rock: סלע חשוף bay: מפרץ @@ -1008,29 +1017,29 @@ he: cave_entrance: כניסה למערה cliff: מצוק crater: מכתש - dune: חולית - fell: תל + dune: דיונה + fell: ערבה אלפינית fjord: פיורד forest: יער geyser: גייזר glacier: קרחון - grassland: דשא + grassland: ערבה heath: בתה hill: גבעה hot_spring: מעיין חם island: אי land: אדמה - marsh: ביצה רדודה - moor: אדמת כבול + marsh: ביצה רדודה (הוחלף) + moor: ערבה גבוהה mud: בוץ peak: פסגה point: נקודה reef: שונית ridge: רכס rock: סלע - saddle: מעבר בין הרים + saddle: אוכף sand: חול - scree: ערמת סלעים + scree: מפולת אבנים scrub: סבך spring: מעיין stone: אבן @@ -1039,51 +1048,51 @@ he: valley: עמק volcano: הר געש water: מים - wetland: מלחה + wetland: ביצה wood: יער - "yes": תכונה טבעית + "yes": אלמנט טבעי office: accountant: רואה חשבון - administrative: מִנהל + administrative: מִנְהָל advertising_agency: סוכנות פרסום architect: אדריכל association: איגוד company: חברה diplomatic: משרד דיפלומטי - educational_institution: מוסד חינוך + educational_institution: מוסד חינוכי employment_agency: סוכנות תעסוקה energy_supplier: משרד ספק אנרגיה estate_agent: מתווך נדל״ן - financial: משרד כלכלי - government: לשכה ממשלתית + financial: משרד פיננסי + government: משרד ממשלתי insurance: משרד ביטוח - it: מוסד חינוך + it: משרד מחשוב lawyer: עורך דין logistics: משרד לוגיסטיקה newspaper: משרד של עתון - ngo: משרד מוסד לא ממשלתי + ngo: ארגון ללא מטרת רווח notary: נוטריון religion: משרד דת - research: משרד מחקר + research: מכון מחקר tax_advisor: יועץ מס telecommunication: משרד תקשורת אלקטרונית travel_agent: סוכנות נסיעות "yes": משרד place: - allotments: שטחים חקלאיים + allotments: חלקות גינון city: עיר city_block: בלוק בעיר country: ארץ county: מחוז farm: חווה - hamlet: כפר + hamlet: יישוב house: בית houses: בתים island: אי islet: איוֹן - isolated_dwelling: מגורים מבודדים - locality: יישוב - municipality: עירייה + isolated_dwelling: חוות בודדים + locality: מקום לא מיושב + municipality: עיר או רשות מקומית neighbourhood: שכונה plot: מגרש postcode: מיקוד @@ -1096,28 +1105,28 @@ he: suburb: פרוור town: עיירה village: כפר - "yes": מקום + "yes": מקום לא מוגדר railway: abandoned: מסילת ברזל נטושה construction: מסילת ברזל בבנייה disused: מסילת ברזל שאינה בשימוש funicular: פוניקולר - halt: תחנת רכבת + halt: תחנת עצירה לרכבת junction: מפגש מסילות ברזל - level_crossing: מפגש מסילת ברזל וכביש + level_crossing: חציית מסילת ברזל light_rail: רכבת קלה miniature: רכבת זעירה monorail: רכבת חד־פסית - narrow_gauge: מסילת רכבת צרה + narrow_gauge: מסילת ברזל צרה platform: רציף רכבת - preserved: רכבת משומרת - proposed: פסי רכבת מוצעים + preserved: מסילת ברזל בשימור + proposed: מסילת ברזל מוצעת spur: שלוחת מסילת ברזל station: תחנת רכבת - stop: תחנת רכבת + stop: תחנת עצירה לרכבת subway: רכבת תחתית - subway_entrance: כניסה לתחנת רכבת תחתית - switch: נקודות מסילת ברזל + subway_entrance: כניסה לרכבת תחתית + switch: פיצול מסילת ברזל tram: חשמלית tram_stop: תחנת חשמלית yard: מוסך רכבות @@ -1125,22 +1134,22 @@ he: agrarian: חנות גינון alcohol: חנות אלכוהול antiques: עתיקות - appliance: חנות מוצרי חשמל - art: חנות חפצי אמנות - baby_goods: חנות למוצרי תינוקות - bag: חנות תיקים + appliance: מוצרי חשמל + art: חפצי אמנות + baby_goods: מוצרי תינוקות + bag: תיקים bakery: מאפייה bathroom_furnishing: ציוד לחדרי מקלחת beauty: סלון יופי - bed: חנות כלי מיטה + bed: חדרי שינה beverages: חנות משקאות bicycle: חנות אפניים - bookmaker: סוכן הימורים + bookmaker: סוכנות הימורים books: חנות ספרים boutique: בוטיק butcher: קצב - car: חנות כלי רכב - car_parts: חלקי רכב + car: סוכנות כלי רכב + car_parts: חלקי חילוף לרכב car_repair: מוסך carpet: חנות שטיחים charity: חנות צדקה @@ -1152,9 +1161,9 @@ he: computer: חנות מחשבים confectionery: קונדיטוריה convenience: מכולת - copyshop: חנות צילום + copyshop: צילום מסמכים cosmetics: חנות קוסמטיקה - craft: חנות מוצרי מלאכת יד + craft: חנות מלאכת יד curtain: חנות וילונות dairy: חנות מוצרי חלב deli: מעדנייה @@ -1171,13 +1180,13 @@ he: fashion: חנות אופנה fishing: חנות ציוד דיג florist: חנות פרחים - food: מכולת - frame: חנות מסגרות + food: חנות מזון + frame: חנות מסגור funeral_directors: בית לוויות furniture: רהיטים garden_centre: מרכז גינון gas: חנות גז - general: מכולת + general: כל-בו gift: חנות מתנות greengrocer: ירקן grocery: מכולת @@ -1192,28 +1201,28 @@ he: interior_decoration: עיצוב פנים jewelry: חנות תכשיטים kiosk: קיוסק - kitchen: חנות כלי מטבח + kitchen: חנות מטבחים laundry: מכבסה locksmith: מנעולן - lottery: הגרלה + lottery: ממכר הגרלות mall: מרכז קניות massage: עיסוי medical_supply: חנות ציוד רפואי mobile_phone: חנות טלפונים ניידים money_lender: הלוואת כספים motorcycle: חנות אופנועים - motorcycle_repair: חנות לתיקון אופנועים - music: חנות כלי נגינה + motorcycle_repair: מוסך אופנועים + music: חנות מוזיקה musical_instrument: כלי נגינה - newsagent: סוכנות חדשות + newsagent: דוכן עיתונים nutrition_supplements: תוספי תזונה optician: אופטיקאי - organic: חנות מזון אורגני - outdoor: חנות ציוד מחנאות - paint: חנות צבע - pastry: חנות מאפים + organic: מזון אורגני + outdoor: ציוד מחנאות + paint: חנות צבעים + pastry: בית מאפה pawnbroker: מַשׁכּוֹנַאי - perfumery: חנות בשמים + perfumery: פרפורמריה pet: חנות חיות מחמד pet_grooming: טיפוח לחיות מחמד photo: חנות צילום @@ -1226,7 +1235,7 @@ he: storage_rental: השכרת מחסנים supermarket: סופרמרקט tailor: חייט - tattoo: חנות קעקועים + tattoo: קעקועים tea: חנות תה ticket: חנות כרטיסים tobacco: חנות טבק @@ -1234,38 +1243,38 @@ he: travel_agency: סוכנות נסיעות tyres: חנות צמיגים vacant: חנות פנויה - variety_store: כלבו + variety_store: חנות מציאות video: ספריית וידאו video_games: חנות משחקי מחשב wholesale: סיטונאות wine: חנות יין - "yes": חנות + "yes": חנות לא מוגדרת tourism: alpine_hut: בקתה אלפינית apartment: דירת נופש - artwork: יצירת אמנות + artwork: מיצג אומנותי attraction: מוקד עניין bed_and_breakfast: לינה וארוחת בוקר cabin: בקתה - camp_pitch: חניון לילה - camp_site: אתר מחנאות - caravan_site: אתר לקרוואנים - chalet: טירה + camp_pitch: חלקה לקמפינג + camp_site: חניון לילה + caravan_site: חניון קרוואנים + chalet: בקתת נופש gallery: גלריה guest_house: בית הארחה hostel: אכסניה hotel: בית מלון - information: מידע + information: מידע למטייל motel: מלון דרכים museum: מוזיאון - picnic_site: אתר לפיקניקים + picnic_site: אתר לפיקניקים, חניון יום theme_park: פארק שעשועים viewpoint: נקודת תצפית wilderness_hut: בקתת טבע zoo: גן חיות tunnel: building_passage: מעבר בין בניינים - culvert: ביוב + culvert: מעבר מים "yes": מנהרה waterway: artificial: נתיב מים מלאכותי @@ -1275,25 +1284,28 @@ he: derelict_canal: תעלה נטושה ditch: מחפורת dock: רציף - drain: ביוב + drain: תעלת ניקוז lock: תא שיט lock_gate: שער בתא שיט - mooring: מעגן + mooring: מצוף עגינה rapids: אשדות river: נהר stream: פלג wadi: ואדי waterfall: מפל מים weir: סכר - "yes": מעבר מימי + "yes": נתיב שיט לא מוגדר admin_levels: - level2: גבול המדינה - level4: גבול המדינה - level5: גבול האזור - level6: גבול המחוז - level8: גבול העיר - level9: גבול הכפר - level10: גבול הפרוור + level2: גבול מדינה + level3: גבול אזור + level4: גבול מחוז + level5: גבול נפה + level6: גבול איזור טבעי + level7: גבול מטרופולין + level8: גבול עיר, מועצה מקומית או איזורית + level9: גבול רובע + level10: גבול שכונה + level11: גבול תת־שכונה types: cities: ערים towns: עיירות @@ -1304,9 +1316,9 @@ he: issues: index: title: בעיות - select_status: לבחור מצב - select_type: בחר סוג - select_last_updated_by: בחירת העדכון האחרון לפי + select_status: בחירת מצב + select_type: בחירת סוג + select_last_updated_by: בחירת העדכון האחרון reported_user: משתמש מדווח not_updated: לא עדכני search: חיפוש @@ -1455,12 +1467,17 @@ he: subject: '[אופן סטריט מאפ OpenStreetMap] תגובה מאת %{user} נוספה לרשומת יומן' hi: שלום %{to_user}, header: '%{from_user} הגיב לרשומת היומן ב־OpenStreetMap עם הנושא %{subject}:' + header_html: '%{from_user} הגיב לרשומת היומן ב־OpenStreetMap עם הנושא %{subject}:' footer: אפשר גם לקרוא את התגובה בכתובת %{readurl} ולהגיב בכתובת %{commenturl} או לשלוח הודעה ליוצר בכתובת %{replyurl} + footer_html: אפשר גם לקרוא את התגובה בכתובת %{readurl} ולהגיב בכתובת %{commenturl} + או לשלוח הודעה למחבר בכתובת %{replyurl} message_notification: - subject_header: '[OpenStreetMap] %{subject}' + subject: '[OpenStreetMap] %{message_title}' hi: שלום %{to_user}, header: 'לתיבתך ב־OpenStreetMap הגיעה הודעה מאת %{from_user} עם הנושא %{subject}:' + header_html: '%{from_user} שלח לך הודעה דרך OpenStreetMap על הנושא %{subject}:' + footer: ניתן גם לקרוא את ההודעה בכתובת %{readurl} ולשלוח הודעה לשולח דרך %{replyurl} footer_html: ניתן גם לקרוא את ההודעה בכתובת %{readurl} ולשלוח הודעה ליוצר דרך %{replyurl} friendship_notification: @@ -1468,11 +1485,22 @@ he: subject: '[אופן סטריט מאפ OpenStreetMap] נוספת לרשימת החברים של %{user}' had_added_you: '%{user} הוסיף אותך כחבר ב־OpenStreetMap.' see_their_profile: באפשרותך לצפות בפרופיל שלו בכתובת %{userurl}. + see_their_profile_html: באפשרותך לצפות בפרופיל שלו בכתובת %{userurl}. befriend_them: באפשרותך לסמנו כחבר בכתובת %{befriendurl}. + befriend_them_html: באפשרותך לסמנו כחבר בכתובת %{befriendurl}. + gpx_description: + description_with_tags_html: 'זה נראה כמו קובץ ה־GPX שלך %{trace_name} עם התיאור + %{trace_description} והתגיות הבאות: %{tags}' + description_with_no_tags_html: זה נראה כמו קובץ ה־GPX שלך %{trace_name} עם התיאור + %{trace_description} וללא תגיות gpx_failure: + hi: שלום %{to_user}, failed_to_import: 'לא יובא כראוי. הנה השגיאה:' + more_info_html: מידע על תקלות בייבוא GPX וכיצד להימנע מהן נמצא תחת %{url}. + import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures subject: '[אופן סטריט מאפ OpenStreetMap] שגיאה בייבוא GPX' gpx_success: + hi: שלום %{to_user}, loaded_successfully: one: נטען כראוי עם %{trace_points} מתוך נקודה אחת אפשרית. two: נטען כראוי עם %{trace_points} מתוך %{possible_points} נקודות אפשריות. @@ -1488,28 +1516,16 @@ he: welcome: אחרי אמות החשבון שלך, נספק לך מידע נוסף שיעזור לך להתחיל. email_confirm: subject: '[אופן סטריט מאפ OpenStreetMap] נא לאמת את כתובת הדוא״ל שלך' - email_confirm_plain: greeting: שלום, hopefully_you: מישהו (אנחנו מקווים שאת או אתה) ביקש לשנות את כתובת הדוא"ל הזאת באתר %{server_url} לכתובת %{new_address} click_the_link: אם באמת עשית את זה, נא ללחוץ על הקישור להלן כדי לאשר את השינוי. - email_confirm_html: - greeting: שלום, - hopefully_you: מישהו (בתקווה מדובר בך) רוצה לשנות את כתובת הדוא״ל המשויכת לחשבון - בשרת %{server_url} אל %{new_address}. - click_the_link: אם באמת עשית את זה, נא ללחוץ על הקישור להלן כדי לאשר את השינוי. lost_password: subject: '[אופן סטריט מאפ OpenStreetMap] בקשת איפוס סיסמה' - lost_password_plain: greeting: שלום, hopefully_you: מישהו (אולי את או אתה) ביקש שהסיסמה המשויכת לחשבון המזוהה עם כתובת הדוא"ל הזאת באתר openstreetmap.org. click_the_link: אם אכן עשית זאת, יש ללחוץ על הקישור להלן כדי לאפס את הסיסמה. - lost_password_html: - greeting: שלום, - hopefully_you: מישהו (בתקווה שמדובר בך) ביקש כי הסיסמה לחשבון המזוהה עם כתובת - הדוא״ל הזאת באתר openstreetmap.org תאופס. - click_the_link: אם באמת ביקשת את זה, נא ללחוץ על הקישור להלן כדי לאפס את הסיסמה. note_comment_notification: anonymous: משתמש אלמוני greeting: שלום, @@ -1519,21 +1535,31 @@ he: subject_other: '[OpenStreetMap] התקבלה תגובה מאת %{commenter} על הערה שהתעניינת בה' your_note: התקבלה תגובה מאת %{commenter} על אחת מהערות המפה שלך ליד %{place} + your_note_html: התקבלה תגובה מאת %{commenter} על אחת מהערות המפה שלך ליד %{place} commented_note: התקלבה תגובה מאת %{commenter} על הערה על מפה שהגבת עליה. הערה נמצאת ליד %{place} + commented_note_html: '%{commenter} הגיב על הערת מפה שהגבת עליה מוקדם יותר. + הערה נמצאת ליד %{place}' closed: subject_own: ‫[OpenStreetMap] אחת מההערות שלך נפתרה על־ידי %{commenter} subject_other: '[OpenStreetMap] הערה שהתעניינת בה נפתרה על־ידי %{commenter}' your_note: אחת מהערות המפה שלך ליד %{place} נפתרה על־ידי %{commenter}. + your_note_html: '%{commenter} פתר את אחת מהערות המפה שלך ליד %{place}.' commented_note: הערת מפה שהגבת עליה נפתרה על־ידי %{commenter}. ההערה נמצאת ליד %{place} + commented_note_html: '%{commenter} פתר הערת מפה שהגבת עליה. ההערה נמצאת ליד + %{place}.' reopened: subject_own: ‫[OpenStreetMap] אחת ההערות שלך הופעלה מחדש ע״י %{commenter} subject_other: '[OpenStreetMap] הערה שמעניינת אותך הופעלה מחדש על־ידי %{commenter}' your_note: הערה שהוספת ליד %{place} הופעלה מחדש על־ידי %{commenter}. + your_note_html: '%{commenter} הפעיל מחדש הערת מפה שהוספת ליד %{place}.' commented_note: הערה במפה שהגבת עליה הופעלה מחדש על־ידי %{commenter}. ההערה היא ליד %{place}. + commented_note_html: '%{commenter} הפעיל מחדש הערת מפה שהגבת עליה. הערה נמצאת + ליד %{place}' details: אפשר למצוא פרטים נוספים על ההערה בכתובת %{url} + details_html: אפשר למצוא פרטים נוספים על ההערה בכתובת %{url}. changeset_comment_notification: hi: שלום %{to_user}, greeting: שלום, @@ -1544,13 +1570,21 @@ he: שהתעניינת בהן' your_changeset: קיבלת הערה מהמשתמש %{commenter} על את מערכות השינויים שיצרת ב־%{time} + your_changeset_html: המשתמש %{commenter} הוסיף הערה ב־%{time} על אחת מערכות + השינויים שלך. commented_changeset: קיבלת הערה מהמשתמש %{commenter} ב־%{time} על אחת מערכות השינויים במפה שעקבת אחריה ונוצרה על־ידי %{changeset_author} + commented_changeset_html: המשתמש %{commenter} הוסיף הערה ב־%{time} על ערכת + שינויים שיצר %{changeset_author} ואת/ה עוקב/ת אחריה. partial_changeset_with_comment: עם ההערה '%{changeset_comment}' + partial_changeset_with_comment_html: עם ההערה '%{changeset_comment}' partial_changeset_without_comment: ללא הערה details: פרטים נוספים על ערכת השינויים אפשר למצוא בכתובת %{url} + details_html: פרטים נוספים על ערכת השינויים אפשר למצוא בכתובת %{url} unsubscribe: כדי לבטל את המינוי לעדכונים מערכת השינויים הזאת, נא לבקר בכתובת %{url} וללחוץ על „ביטול מינוי”. + unsubscribe_html: כדי לבטל את המעקב אחרי עדכוני מערכת השינויים הזאת, נא לבקר + בכתובת %{url} וללחוץ על „ביטול מינוי”. messages: inbox: title: תיבת דואר נכנס @@ -1621,6 +1655,24 @@ he: as_unread: ההודעה סומנה כהודעה שלא נקראה destroy: destroyed: ההודעה נמחקה + shared: + markdown_help: + title_html: פוענח בעזרת kramdown + headings: כותרות + heading: כותרת + subheading: כותרת משנה + unordered: רשימה בלתי־ממוינת + ordered: רשימה ממוינת + first: הפריט הראשון + second: הפריט השני + link: קישור + text: טקסט + image: תמונה + alt: טקסט חלופי + url: כתובת URL + richtext_field: + edit: עריכה + preview: תצוגה מקדימה site: about: next: הבא @@ -1809,16 +1861,6 @@ he: ייעשה. באפשרותך להגדיר את העריכות שלך כציבוריות דרך %{user_page} שלך. user_page_link: דף המשתמש anon_edits_link_text: ר' הסבר מדוע זה כך. - flash_player_required_html: יש צורך בנגן פלאש כדי להשתמש ב־Potlatch, ערוך הפלאש - של OpenStreetMap. אפשר להוריד - נגן פלאש מאתר Adobe.com. יש אפשרויות - נוספות לעריכת OpenStreetMap. - potlatch_unsaved_changes: יש לך שינויים שלא נשמרו. (כדי לשמור ב־Potlatch, יש - לבטל את הבחירה של הדרך או הנקודה הנוכחים במצב עריכה חיה, או לשמור אם כפתור - השמירה זמין.) - potlatch2_not_configured: Potlatch 2 לא הוגדר – ר׳ https://wiki.openstreetmap.org/wiki/The_Rails_Port - potlatch2_unsaved_changes: יש לך שינויים שלא נשמרו. (כדי לשמור ב־Potlatch 2, - יש ללחוץ „שמירה”.) id_not_configured: לא התבצעו הגדרות של iD no_iframe_support: הדפדפן שלך אינו תומך באלמנטים מסוג iframe של HTML, ואלו חיוניים עבור תכונה זו. @@ -2045,8 +2087,8 @@ he: node_html: נקודה מייצגת מיקום נקודתי, כגון מסעדה אחת או ×¢×¥ אחד. way_html: נתיב הוא קו או אזור כמו דרך, זרם, אגם או מבנה. - tag_html: תג הוא פיסת מידע על נקודה או על נתיב כמו שם של - מסעדה או מגבלת מהירות בדרך. + tag_html: תג הוא פיסת מידע על נקודה או על קו כמו שם של מסעדה + או מגבלת מהירות בדרך. rules: title: חוקים! paragraph_1_html: ל־OpenStreetMap יש מעט חוקים פורמליים, אבל אנחנו מצפים מכל @@ -2143,9 +2185,9 @@ he: map: מפה index: public_traces: מסלולי GPS ציבוריים - my_traces: נתיבי ה־GPS שלי + my_traces: הקלטות ה־GPS שלי public_traces_from: מסלולי GPS ציבוריים מאת %{user} - description: עיון בהעלאות אחרונות של נתיבי GPS + description: עיון בהעלאות אחרונות של הקלטות GPS tagged_with: ' מתויג עם %{tags}' empty_html: אין פה עדיין שום דבר. אפשר להעלות מידע חדש או ללמוד עוד על מעקב מסלולים ב־GPS בדף @@ -2922,33 +2964,33 @@ he: redactions: edit: description: תיאור - heading: עריכת חיתוך + heading: עריכת הסרה title: עריכת חיתוך index: - empty: אין חיתוכים שאפשר להציג + empty: אין הסרות שאפשר להציג heading: רשימת חיתוכים - title: רשימת חיתוכים + title: רשימת הסרות new: description: תיאור - heading: הזנת מידע לחיתוך חדש + heading: הוספת מידע להסרה חדשה title: מתבצעת יצירת חיתוך חדש show: description: 'תיאור:' - heading: הצגת החיתוך „%{title}” + heading: הצגת ההסרה „%{title}” title: הצגת חיתוך user: 'יוצר:' - edit: עריכת החיתוך הזה + edit: עריכת ההסרה הזאת destroy: הסרת החיתוך הזה confirm: באמת? create: - flash: נוצר חיתוך + flash: הסרה נוצרה. update: flash: השינויים שנשמרו. destroy: - not_empty: החיתוך אינו ריק. נא לבטל את החיתוכים של הגרסאות ששיכות לחיתוך הזה - לפני הריסתו. + not_empty: ההסרה אינה ריקה. נא לבטל את ההסרות של הגרסאות ששיכות להסרה זו לפני + ביטולה. flash: החיתוך נהרס. - error: אירעה שגיאה בעת הריסת החיתוך הזה. + error: אירעה שגיאה בעת ביטול ההסרה הזאת. validations: leading_whitespace: יש רווח בהתחלה trailing_whitespace: יש רווח בסוף diff --git a/config/locales/hi.yml b/config/locales/hi.yml index 88c851d77..6c9294432 100644 --- a/config/locales/hi.yml +++ b/config/locales/hi.yml @@ -13,6 +13,7 @@ # Author: Sfic # Author: Shubhamkanodia # Author: Siddhartha Ghai +# Author: ThisIsACreeper0101 # Author: Vdhatterwal --- hi: @@ -20,6 +21,8 @@ hi: formats: friendly: '%e %B %Y को %H:%M पर' helpers: + file: + prompt: फाइल चुनें submit: diary_comment: create: सहेजें @@ -32,14 +35,21 @@ hi: create: भेजें client_application: create: खाता बनाएं - update: संपादन + update: अपडेट करें + redaction: + create: रिडैक्शन बनाएँ + update: रिडैक्शन सहेजें trace: create: अपलोड update: बदलाव सहेजें + user_block: + create: ब्लॉक बनाएँ + update: ब्लॉक को अपडेट करें activerecord: errors: messages: invalid_email_address: 'यह ई-मेल ऐड्रेस संभवत: अमान्य है' + email_address_not_routable: रास्ता बनाने लायक नहीं है models: acl: अभिगम नियंत्रण सूची changeset: बदलाव @@ -48,6 +58,7 @@ hi: diary_comment: डायरी टिप्पणी diary_entry: डायरी प्रविष्टि friend: दोस्त + issue: समस्या language: भाषा message: संदेश node: बिंदु @@ -64,6 +75,7 @@ hi: relation: संबंध relation_member: संबंध का सदस्य relation_tag: संबंध का अंकितक + report: रिपोर्ट करें session: सत्र trace: अनुरेख tracepoint: अनुरेखण बिंदु @@ -75,6 +87,18 @@ hi: way_node: रेखा का बिंदु way_tag: रेखा का अंकितक attributes: + client_application: + name: नाम (ज़रूरी) + url: मुख्य ऐप्लिकेशन URL (ज़रूरी) + callback_url: कॉलबैक URL + support_url: सहायता URL + allow_read_prefs: उनकी सदस्य प्राथमिकाताएँ पढ़ें + allow_write_prefs: उनके सदस्य प्राथमिकताओं को बदलें + allow_write_diary: डायरी एंट्री, कमेंट बनाइए और दोस्ती कीजिए + allow_write_api: मैप को मॉडिफाई करें + allow_read_gpx: उनके GPS रेखा को देखें + allow_write_gpx: GPS रेखा अपलोड करें + allow_write_notes: नोट मॉडिफाई करें diary_comment: body: शरीर diary_entry: @@ -89,18 +113,23 @@ hi: trace: user: सदस्य visible: दृश्य - name: नाम + name: चित्र का नाम size: आकार latitude: अक्षांश longitude: देशांतर public: सार्वजनिक description: वर्णन - visibility: दृष्टता + gpx_file: GPX फाइल अपलोड करें + visibility: दृश्यता + tagstring: टैग message: sender: प्रेषक title: विषय body: संदेश का शारीर recipient: प्राप्तकर्ता + report: + category: अपने रिपोर्ट का एक कारण दें + details: कृपया अपनी समस्या के बारे में थोड़ी और जानकारी दें (ज़रूरी) user: email: ई-मेल active: सक्रिय @@ -108,6 +137,10 @@ hi: description: वर्णन languages: भाषाओं pass_crypt: पासवर्ड + pass_crypt_confirmation: पासवर्ड कन्फर्म करें + help: + trace: + tagstring: कॉमा डीलिमिट किया गया है datetime: distance_in_words_ago: about_x_hours: @@ -123,14 +156,47 @@ hi: one: करीब १ साल पहले other: करीब %{count} साल पहले half_a_minute: करीब एक मिनट पहले + less_than_x_seconds: + one: १ सेकंड से कम समय पहले + other: '%{count} से कम समय पहले' + less_than_x_minutes: + one: १ मिनट से कम समय पहले + other: '%{count} से कम समय पहले' + over_x_years: + one: १ साल से ज़यादा समय पहले + other: less than %{count} सालों से ज़्यादा समय पहले + x_seconds: + one: १ सेकंड पहले + other: '%{count} सेकंड पहले' + x_minutes: + one: १ मिनट पहले + other: '%{count} मिनट पहले' + x_days: + one: १ दिन पहले + other: '%{count} दिन पहले' + x_months: + one: एक महीने पहले + other: '%{count} महीने पहले' + x_years: + one: १ साल पहले + other: '%{count} साल पहले' editor: default: डिफ़ॉल्ट (currently %{name}) - potlatch: - name: पौटलैच 1 id: name: आईडी - potlatch2: - name: पौटलैच 2 + description: iD (ब्राउज़र का एडिटर) + remote: + name: रिमोट कंट्रोल + description: रिमोट कंट्रोल (JOSM या Merkaartor) + auth: + providers: + none: कुछ नहीं + openid: OpenID + google: गूगल + facebook: फेसबुक + windowslive: विन्डोज़ लाइव + github: गिट्हब + wikipedia: विकिपीडिया api: notes: comment: @@ -143,36 +209,88 @@ hi: reopened_at_html: '%{when} पर पुन: सक्रिय किया गया' reopened_at_by_html: '%{when} पर %{user} ने पुन: सक्रिय किया' rss: + title: ओपनस्ट्रीटमैप नोट + description_area: आपके इलाके में नोट, रिपोर्ट किए गए, कमेंट किए गए या बंद + किए चीज़ों गए की सूची [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] + description_item: नोट %{id} के लिए rss फीड + opened: नया नोट (%{place} के पास) commented: नया जवाब (%{place} के पास) + closed: बंद किया गया नोट (%{place} के पास) + reopened: फिर से खोला गया नोट (%{place} के पास) entry: comment: जवाब + full: पूरा नोट browse: + created: बनाया गया + closed: बंद किया गया + created_html: %{time} बनाया गया + closed_html: %{time} बंद किया गया + created_by_html: '%{user} द्वारा %{time} खोला + गया' + deleted_by_html: '%{user} द्वारा %{time} को बंद + किया गया' + edited_by_html: '%{user} द्वारा %{time} को सम्पादित + किया गया' + closed_by_html: '%{user} द्वारा %{time} को बंद + किया गया' version: संस्करण + in_changeset: Changeset anonymous: अनामक no_comment: (कोई टिप्पणी नहीं) + part_of: इसका भाग + part_of_relations: + one: १ सम्बंध + other: '%{count} सम्बंध' + part_of_ways: + one: १ रास्ता + other: '%{count} रास्तें' + download_xml: XML डाउनलोड करें view_history: इतिहास देखें view_details: जानकारी देखें location: 'स्थान:' changeset: + title: 'Changeset: %{id}' belongs_to: लेखक node: बिंदु (%{count}) + node_paginated: नोड (%{count} का %{x}-%{y}) way: रेखाएं (%{count}) + way_paginated: रास्तें (%{count} का %{x}-%{y}) + relation: सम्बन्ध (%{count}) + relation_paginated: सम्बन्ध (%{count} के %{x}-%{y}) comment: जवाब (%{count}) + hidden_commented_by_html: '%{user} से कमेंट छिपाया गया %{when}' + commented_by_html: '%{user} से कमेंट %{when}' + changesetxml: Changeset XML + osmchangexml: osmChange XML + feed: + title: 'Changeset: %{id}' + title_comment: Changeset %{id} - %{comment} + join_discussion: चर्चा में भाग लेने के लिए लॉग इन करें discussion: चर्चा still_open: चेंजसेट अभी भी खुला - चेंजसेट के एक बार बंद होने के पश्चात चर्चा होगी। node: title_html: 'बिंदु: %{name}' + history_title_html: 'नोड इतिहास: %{name}' way: title_html: 'रेखा: %{name}' history_title_html: 'रेखा का इतिहास: %{name}' nodes: बिंदु + nodes_count: + one: १ नोड + other: '%{count} नोड' also_part_of_html: one: इस रेखा का हिस्सा है‌ %{related_ways} other: इन रेखाओं का हिस्सा है %{related_ways} relation: + title_html: 'सम्बन्ध: %{name}' + history_title_html: 'सम्बन्ध इतिहास: %{name}' members: सदस्य + members_count: + one: '१ सदस्य ' + other: '%{count} सदस्य' relation_member: + entry_role_html: '%{type} %{role} के रूप में %{name}' type: node: बिंदु way: रेखा @@ -181,17 +299,26 @@ hi: entry_html: संबंध %{relation_name} entry_role_html: संबंध %{relation_name} (as %{relation_role}) not_found: - sorry: क्षमा करें, ये %{type} इस आईडी %{id } के साथ, पाया नहीं जा सका + title: नहीं मिला + sorry: 'माफ़ कीजिए, %{type} #%{id} नहीं मिल पाया।' type: node: बिंदु way: रेखा relation: संबंध + changeset: changeset + note: नोट timeout: + title: समय ज़्यादा हो जाने पर त्रुटि + sorry: माफ़ कीजिए, ID %{id} वाले %{type} का डेटा लाते वक्त कुछ ज़्यादा ही समय + लगा। type: node: बिंदु way: रेखा relation: संबंध + changeset: changeset + note: नोट redacted: + redaction: लोपन %{id} type: node: बिंदु way: रेखा @@ -226,12 +353,7 @@ hi: new: title: नई डायरी प्रवेश form: - subject: 'विषय:' - body: 'दैनिकी प्रविष्टि का शारीर:' - language: 'भाषा:' location: 'स्थान:' - latitude: अक्षांश - longitude: देशांतर use_map_link: नक्शा का इस्तेमाल index: title: सदस्यों की दैनिकी @@ -326,7 +448,6 @@ hi: marketplace: बाज़ार nightclub: नाईट क्लब nursing_home: नर्सिंग होम - office: कार्यालय parking: पार्किंग parking_entrance: पार्किंग प्रवेश parking_space: पार्किंग की जगह @@ -341,7 +462,6 @@ hi: restaurant: भोजनालय school: विद्यालय shelter: आश्रालय - shop: दुकान studio: स्टुडियो swimming_pool: तरणताल taxi: टैक्सी @@ -353,7 +473,6 @@ hi: waste_basket: कूड़ादान waste_disposal: ढलाव water_point: जल बिंदु - youth_centre: युवा केन्द्र boundary: national_park: राष्ट्रीय उद्यान protected_area: संरक्षित क्षेत्र @@ -505,7 +624,6 @@ hi: kitchen: रसोई की वस्तुओं की दुकान lottery: लॉटरी mall: मौल - market: बाज़ार massage: मालिश pawnbroker: साहूकार seafood: समुद्री खाद्य @@ -539,7 +657,6 @@ hi: level8: शहर सीमा level9: गांव सीमा level10: इलाके की सीमा - description: types: cities: नगर towns: शहर @@ -576,15 +693,13 @@ hi: help: सहायता community: समुदाय foundation: संस्थान - notifier: + user_mailer: diary_comment_notification: subject: '[OpenStreetMap] %{user} ने एक दैनिकी पर प्रतिक्रिया दी' friendship_notification: subject: '[OpenStreetMap] %{user} ने आपको अपने दोस्तों में शामिल किया है' had_added_you: '%{user} ने आपको OpenStreetMap पर अपने दोस्तों में शामिल किया है।' - gpx_notification: - greeting: नमस्कार, note_comment_notification: greeting: नमस्कार, messages: @@ -600,10 +715,6 @@ hi: copyright: legal_babble: contributors_title_html: हमारे योगदानकर्ता - edit: - potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you - should deselect the current way or point, if editing in list mode, or click - save if you have a save button.) export: area_to_export: क्षेत्र निर्यात करने के लिए manually_select: कृपया, आप एक अलग क्षेत्र चुनिए @@ -669,19 +780,12 @@ hi: oauth_clients: show: key: उपभोक्ता कुंजी - allow_write_api: नक्शे में तब्दीली - form: - name: नाम - required: आवश्यकता - allow_write_api: नक्शा संपादित करें. - allow_write_notes: नोट संशोधित करें। users: lost_password: title: lost password new password button: Send me a new password reset_password: title: reset password - password: 'पासवर्ड:' show: my friends: मेरे मित्र account: diff --git a/config/locales/hr.yml b/config/locales/hr.yml index bd84e0a40..84d6df3e0 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -131,15 +131,9 @@ hr: half_a_minute: prije pola minute editor: default: Zadano (currently %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (editor unutar web preglednika) id: name: iD description: iD (uređivač u pregledniku) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (editor unutar web preglednika) remote: name: Remote Control description: Remote Control (JOSM ili Merkaartor) @@ -327,12 +321,7 @@ hr: new: title: Novi zapis u dnevnik form: - subject: 'Predmet:' - body: 'Sadržaj:' - language: 'Jezik:' location: 'Lokacija:' - latitude: 'Geografska Å¡irina (Latitude):' - longitude: 'Geografska dužina (Longitude):' use_map_link: koristi kartu index: title: Dnevnici korisnika @@ -987,25 +976,12 @@ hr: greeting: Hej! email_confirm: subject: '[OpenStreetMap] Potvrdi svoju e-mail adresu' - email_confirm_plain: greeting: Bok, click_the_link: Ako si ovo ti, molim klinkni na link ispod da potvrdiÅ¡ promjene. - email_confirm_html: - greeting: Bok, - hopefully_you: Netko (nadam se ti) bi želio promjeniti njihovu email adresu - sa %{server_url} na %{new_address}. - click_the_link: Ako si ovo ti, klikni na ispod navedeni link za potvrdu promjene lost_password: subject: '[OpenStreetMap] Zahtjev za resetom lozinke' - lost_password_plain: greeting: Bok, click_the_link: Ako si ovo ti, klikni na link ispod za reset lozinke. - lost_password_html: - greeting: Bok, - hopefully_you: Netko (moguće, ti) pitao je za reset lozinke na njihoim email - adresama openstreetmap.org računu. - click_the_link: Ako si ovo ti, molim klikni link ispod za resetiranje tvoje - lozinke. note_comment_notification: anonymous: Anonimni korisnik greeting: Bok, @@ -1203,15 +1179,6 @@ hr: Možete namjestiti svoje promjene u javne sa %{user_page}. user_page_link: korisnička stranica anon_edits_link_text: Otkrij zaÅ¡to je to slučaj. - flash_player_required_html: Trebate Flash player da bi koristili Potlatch, OpenStreetMap - uređivač izrađen u Flash-u. Možete preuzeti - Abode Flash Player sa Adobe.com. Neke - druge mogućnosti su također dostupne za uređivanje OpenStreetMapa. - potlatch_unsaved_changes: Niste spremili promjene. (Da bi spremili u Potlatchu, - morate odznačiti trenutni put ili točku ako uređujete uživo; ili kliknite - SPREMI ako imate taj gumb.) - potlatch2_unsaved_changes: Neke promjene nisu spremljene. (Da biste spremili - u Potlatch 2, trebali bi kliknuti Spremi.) id_not_configured: iD nije konfiguriran no_iframe_support: Tvoj preglednik ne podržava HTML iframes, koji su nužni za ovu mogućnost. diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml index 665afd6e9..f9a6984f3 100644 --- a/config/locales/hsb.yml +++ b/config/locales/hsb.yml @@ -154,15 +154,9 @@ hsb: other: před %{count} lětomaj editor: default: Standard (tuchwilu %{name} - potlatch: - name: Potlatch 1 - description: Potlatch 1 (editor za wobdźěłowanje we wobhladowaku) id: name: iD description: iD (we wobhladowaku zasadźeny editor) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (editor za wobdźěłowanje we wobhladowaku) remote: name: Dalokowodźenje description: Dalokowodźenje (JOSM abo Merkaartor) @@ -360,12 +354,7 @@ hsb: new: title: Nowy zapisk do dźenika form: - subject: 'Nastupa:' - body: 'Tekst:' - language: 'Rěč:' location: 'Městno:' - latitude: 'Šěrokostnik:' - longitude: 'Dołhostnik:' use_map_link: kartu wužiwać index: title: Wužiwarske dźeniki @@ -1194,7 +1183,6 @@ hsb: footer: MóžeÅ¡ komentar tež na %{readurl} čitać a na %{commenturl} komentować abo na %{replyurl} wotmołwić message_notification: - subject_header: '[OpenStreetMap] %{subject}' hi: Witaj %{to_user}, header: '%{from_user} je ći přez OpenStreetMap powěsć z temu %{subject} pósłał(a):' footer_html: MóžeÅ¡ powěsć tež pod %{readurl} čitać a pod %{replyurl} wotmołwić @@ -1222,32 +1210,18 @@ hsb: krokach. email_confirm: subject: '[OpenStreetMap] Twoju mejlowu adresu wobkrućić' - email_confirm_plain: greeting: Witaj, hopefully_you: Něchtó (nadźijomnje ty) chce swoju mejlowu adresu na %{server_url} změnić na %{new_address} click_the_link: Jeli ty to sy, klikń proÅ¡u na slědowacy wotkaz, zo by změnu wobkrućił(a). - email_confirm_html: - greeting: Witaj, - hopefully_you: Něchtó (nadźijomnje ty) chce swoju mejlowu adresu pola %{server_url} - na %{new_address} změnić. - click_the_link: Jeli ty to sy, klikń proÅ¡u na slědowacy wotkaz, zo by změnu - wobkrućił(a). lost_password: subject: '[OpenStreetMap] Próstwa wo wróćostajenje hesła' - lost_password_plain: greeting: Witaj, hopefully_you: Něchtó (najskerje ty) je pod tutej mejlowej adresu wo to prosył, hesło za konto na openstreetmap.org wróćo stajić. click_the_link: Jeli ty to sy, klikń proÅ¡u na slědowacy wotkaz, zo by swoje hesło wróćo stajił(a). - lost_password_html: - greeting: Witaj, - hopefully_you: Něchtó (najskerje ty) je wo to prosył, hesło za konto tuteje - mejloweje adresy na openstreetmap.org wróćo stajić. - click_the_link: Jeli ty to sy, klikń proÅ¡u na slědowacy wotkaz, zo by swoje - hesło wróćo stajił(a). note_comment_notification: anonymous: Anonymny wužiwar greeting: Witaj, @@ -1519,17 +1493,6 @@ hsb: MóžeÅ¡ swoje změny na swojej %{user_page} jako zjawne markěrować. user_page_link: wužiwarskej stronje anon_edits_link_text: Zwěsćić, čehoždla je tomu tak. - flash_player_required_html: TrjebaÅ¡ wothrawak Flash, zo by Potlatch, editor - OpenStreetMap Flash wužiwał. MóžeÅ¡ wothrawak - Flash wot Adobe.com sćahnyć. Někotre - druhe móžnosće tež za wobdźěłowanje OpenStreetMap k dispoziciji steja. - potlatch_unsaved_changes: NimaÅ¡ njeskładowane změny. (Zo by w programje Potlatch - składował, wotstroń woznamjenjenje aktualneho puća abo dypka, jeli w dynamiskim - modusu wobdźěłujeÅ¡, abo klikń na Składować, jeli składowanske tłóčatko eksistuje. - potlatch2_not_configured: Potlatch 2 hišće konfigurowany njeje - proÅ¡u hlej - http://wiki.openstreetmap.org/wiki/The_Rails_Port - potlatch2_unsaved_changes: MaÅ¡ njeskładowane změny. (Zo by je w Potlatch 2 składował, - dyrbiÅ¡ na "składować" kliknyć.) id_not_configured: iD njeje so konfigurował no_iframe_support: Twó wobhladowak njepodpěruje iframe-elementy, kotrež su za tutu funkciju trěbne. diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 19f229eb0..87b7dbaa4 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -162,8 +162,8 @@ hu: other: majdnem %{count} éve half_a_minute: fél perccel ezelőtt less_than_x_seconds: - one: kevesebb, mint 1 másodperce - other: kevesebb, mint %{count} másodperce + one: kevesebb mint 1 másodperce + other: kevesebb mint %{count} másodperce less_than_x_minutes: one: kevesebb mint 1 perce other: kevesebb mint %{count} perce @@ -187,15 +187,9 @@ hu: other: '%{count} éve' editor: default: Alapértelmezett (jelenleg %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (böngészőn belüli szerkesztő) id: name: iD description: iD (böngészőben futó szerkesztő) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (böngészőn belüli szerkesztő) remote: name: Távirányító description: Távirányító (JOSM vagy Merkaartor) @@ -406,12 +400,7 @@ hu: new: title: Új naplóbejegyzés form: - subject: 'Tárgy:' - body: 'Szöveg:' - language: 'Nyelv:' location: 'Hely:' - latitude: 'Földrajzi szélesség:' - longitude: 'Földrajzi hosszúság:' use_map_link: térkép használata index: title: Felhasználók naplói @@ -1252,7 +1241,6 @@ hu: footer: 'A hozzászólást elolvashatod itt is: %{readurl} és hozzászólhatsz itt: %{commenturl} vagy válaszolhatsz rá itt: %{replyurl}' message_notification: - subject_header: '[OpenStreetMap] %{subject}' hi: Szia %{to_user}! header: '%{from_user} küldött neked egy üzenetet az OpenStreetMapon keresztül %{subject} tárggyal:' @@ -1283,32 +1271,18 @@ hu: az elinduláshoz. email_confirm: subject: '[OpenStreetMap] E-mail cím megerősítése' - email_confirm_plain: greeting: Szia! hopefully_you: 'Valaki (remélhetőleg te) szeretné megváltoztatni az e-mail címét a %{server_url} címen, erre: %{new_address}.' click_the_link: Ha ez Te vagy, akkor a módosítás megerősítéséhez kattints az alábbi hivatkozásra. - email_confirm_html: - greeting: Szia! - hopefully_you: 'Valaki (remélhetőleg Te) meg szeretné változtatni az e-mail - címét az %{server_url} oldalon erre: %{new_address}.' - click_the_link: Ha ez Te vagy, akkor a módosítás megerősítéséhez kattints az - alábbi hivatkozásra. lost_password: subject: '[OpenStreetMap] Jelszó alaphelyzetbe állításának kérése' - lost_password_plain: greeting: Szia! hopefully_you: Valaki (remélhetőleg te) jelszó visszaállítást kért, ehhez az e-mail címhez tartozó openstreetmap.org felhasználónak. click_the_link: Ha ez Te vagy, akkor a jelszó alaphelyzetbe állításához kattints az alábbi hivatkozásra. - lost_password_html: - greeting: Szia! - hopefully_you: Valaki (esetleg Te) kérte, hogy az ehhez az e-mail címhez tartozó - openstreetmap.org felhasználói fiók jelszava kerüljön alaphelyzetbe. - click_the_link: Ha ez Te vagy, akkor a jelszó alaphelyzetbe állításához kattints - az alábbi hivatkozásra. note_comment_notification: anonymous: Egy névtelen felhasználó greeting: Szia! @@ -1601,17 +1575,6 @@ hu: teszed meg. Nyilvánossá teheted szerkesztéseidet a %{user_page}adról. user_page_link: felhasználói oldal anon_edits_link_text: Nézz utána, miért van ez. - flash_player_required_html: A Potlatch, az OpenStreetMap Flash szerkesztő használatához - Flash Player szükséges. Letöltheted - a Flash Playert az Adobe.com-ról. Számos - más lehetőség is elérhető az OpenStreetMap szerkesztéséhez. - potlatch_unsaved_changes: Nem mentett módosítások vannak. (Potlatchban való - mentéshez szüntesd meg a jelenlegi vonal vagy pont kijelölését, ha élő módban - szerkesztesz, vagy kattints a mentésre, ha van mentés gomb.) - potlatch2_not_configured: 'A Potlatch 2 nincs beállítva – további információért - lásd: https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2' - potlatch2_unsaved_changes: Mentetlen módosításaid vannak. (A mentéshez a Potlatch - 2-ben kattintanod kell a mentésre.) id_not_configured: Az iD nincs beállítva no_iframe_support: A böngésződ nem támogatja a HTML-kereteket, amely ehhez a funkcióhoz szükséges. @@ -1850,10 +1813,10 @@ hu: mint például egy étterem neve vagy egy sebességkorlátozás mértéke. rules: title: Szabályok! - paragraph_1_html: "Az openStreetMap-nek van néhány formális szabálya is de - alapvetően minden résztvevőtől azt várjuk el hogy együttműködjön és kommunikáljon + paragraph_1_html: "Az OpenStreetMap-nek van néhány formális szabálya is, de + alapvetően minden résztvevőtől azt várjuk el, hogy együttműködjön és kommunikáljon a közösség többi tagjával. Ha bármilyen kézi szerkesztésen túlmutató tevékenységet - tervezel akkor kérjük, hogy olvasd el az erről szóló útmutatókat az \nImportálásról és az \nAutomatikus szerkesztésekről szóló lapokon." @@ -2355,7 +2318,7 @@ hu: button: Megerősítés success: Az e-mail címed módosítása megerősítve! failure: Egy e-mail cím már megerősítésre került ezzel az utalvánnyal. - unknown_token: Ez a megerősítő kódo lejárt, vagy nem létezik. + unknown_token: Ez a megerősítő kód lejárt, vagy nem létezik. set_home: flash success: Otthon helye sikeresen mentve go_public: diff --git a/config/locales/ia.yml b/config/locales/ia.yml index 55f5ed3c3..0ad9fbc51 100644 --- a/config/locales/ia.yml +++ b/config/locales/ia.yml @@ -175,15 +175,9 @@ ia: other: '%{count} annos retro' editor: default: Predefinite (actualmente %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (editor in navigator del web) id: name: iD description: iD (editor in navigator) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (editor in navigator del web) remote: name: Controlo remote description: Controlo remote (JOSM o Merkaartor) @@ -406,13 +400,8 @@ ia: new: title: Nove entrata de diario form: - subject: 'Subjecto:' - body: 'Texto:' - language: 'Lingua:' - location: 'Loco:' - latitude: 'Latitude:' - longitude: 'Longitude:' - use_map_link: usar carta + location: Loco + use_map_link: Usar le carta index: title: Diarios de usatores title_friends: Diarios de amicos @@ -441,7 +430,8 @@ ia: body: Pardono, il non ha un entrata de diario o commento con le ID %{id}. Verifica le orthographia, o pote esser que le ligamine que tu sequeva es incorrecte. diary_entry: - posted_by_html: Publicate per %{link_user} le %{created} in %{language_link} + posted_by_html: Publicate per %{link_user} le %{created} in %{language_link}. + updated_at_html: Ultime actualisation le %{updated}. comment_link: Commentar iste entrata reply_link: Inviar un message al autor comment_count: @@ -712,20 +702,37 @@ ia: carpenter: Carpentero caterer: Catering confectionery: Confecteria + dressmaker: Modista electrician: Electricista + electronics_repair: Reparation de electronica gardener: Jardinero + glaziery: Vitreria + handicraft: Artisanato + hvac: Fabricante de climatisation + metal_construction: Constructor in metallo painter: Pictor photographer: Photographo plumber: Plumbero + roofer: Copertor de tectos + sawmill: Serreria shoemaker: Scarpero + stonemason: Taliator de petras tailor: Sartor + window_construction: Construction de fenestras + winery: Vinia "yes": Boteca de artisanato emergency: + access_point: Puncto de accesso ambulance_station: Station de ambulantias assembly_point: Puncto de incontro defibrillator: Defibrillator + fire_xtinguisher: Extinctor de incendios + fire_water_pond: Bassino de aqua contra incendios landing_site: Loco de atterrage de emergentia + life_ring: Boia de salvamento phone: Telephono de emergentia + siren: Sirena de emergentia + suction_point: Puncto de suction de emergentia water_tank: Cisterna de aqua de emergentia "yes": Emergentia highway: @@ -738,6 +745,7 @@ ia: cycleway: Pista cyclabile elevator: Ascensor emergency_access_point: Puncto de accesso de emergentia + emergency_bay: Rampa de emergentia footway: Sentiero pro pedones ford: Vado give_way: Signal de ceder le passage @@ -768,18 +776,23 @@ ia: tertiary: Via tertiari tertiary_link: Via tertiari track: Pista + traffic_mirror: Speculo de traffico traffic_signals: Lumines de traffico + trailhead: Initio de sentiero trunk: Via national trunk_link: Via national turning_loop: Bucla de giro unclassified: Via non classificate "yes": Cammino historic: + aircraft: Avion historic archaeological_site: Sito archeologic + bomb_crater: Crater de bomba historic battlefield: Campo de battalia boundary_stone: Lapide de frontiera building: Edificio historic bunker: Bunker + cannon: Cannon historic castle: Castello church: Ecclesia city_gate: Porta de citate @@ -1348,32 +1361,18 @@ ia: supplementari pro adjutar te a comenciar. email_confirm: subject: '[OpenStreetMap] Confirma tu adresse de e-mail' - email_confirm_plain: 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 confirmar le alteration. - email_confirm_html: - greeting: Salute, - hopefully_you: Alcuno (sperabilemente 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 - confirmar le alteration. lost_password: subject: '[OpenStreetMap] Requesta de reinitialisation del contrasigno' - lost_password_plain: greeting: Salute, hopefully_you: Alcuno (probabilemente tu) ha demandate que le contrasigno del conto openstreetmap.org associate con iste adresse de e-mail sia reinitialisate. click_the_link: Si isto es tu, per favor clicca super le ligamine ci infra pro reinitialisar tu contrasigno. - lost_password_html: - greeting: Salute, - hopefully_you: Alcuno (possibilemente tu) ha demandate que le contrasigno del - conto openstreetmap.org associate con iste adresse de e-mail sia reinitialisate. - click_the_link: Si isto es tu, per favor clicca super le ligamine ci infra pro - reinitialisar tu contrasigno. note_comment_notification: anonymous: Un usator anonyme greeting: Salute, @@ -1670,17 +1669,6 @@ ia: lo face. Tu pote configurar tu modificationes como public a partir de tu %{user_page}. user_page_link: pagina de usator anon_edits_link_text: Lege proque isto es le caso. - flash_player_required_html: Es necessari haber un reproductor Flash pro usar - Potlatch, le editor Flash de OpenStreetMap. Tu pote discargar - Flash Player a Adobe.com. Plure - altere optiones es tamben disponibile pro modificar OpenStreetMap. - potlatch_unsaved_changes: Tu ha modificationes non salveguardate. (Pro salveguardar - in Potlatch, tu debe deseliger le via o puncto actual si tu modifica in modo - directe, o cliccar super le button Salveguardar si presente.) - potlatch2_not_configured: Potlatch 2 non ha essite configurate. Visita https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 - pro plus information - potlatch2_unsaved_changes: Tu ha modificationes non salveguardate. (In Potlatch - 2, tu debe cliccar super Salveguardar.) id_not_configured: iD non ha essite configurate no_iframe_support: Tu navigator non supporta le iframes in HTML, necessari pro iste functionalitate. diff --git a/config/locales/id.yml b/config/locales/id.yml index cf24129aa..c92a7da88 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -198,15 +198,9 @@ id: other: '%{count} tahun yang lalu' editor: default: Standar (saat ini %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (editor di dalam browser) id: name: iD description: iD (editor di dalam browser internet) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (editor di dalam browser) remote: name: Pengendali Jarak Jauh description: Remote Control (JOSM atau Merkaartor) @@ -437,12 +431,7 @@ id: new: title: Entri Baru Catatan Harian form: - subject: 'Subjek:' - body: 'Isi:' - language: 'Bahasa:' location: 'Lokasi:' - latitude: 'Lintang:' - longitude: 'Bujur:' use_map_link: gunakan peta index: title: Catatan harian pengguna @@ -472,7 +461,8 @@ id: body: Maaf, tidak ada catatan harian atau komentar dengan id %{id}. Harap periksa ejaan atau mungkin Anda mengklik tautan yang salah. diary_entry: - posted_by_html: Diterbitkan oleh %{link_user} pada %{created} dalam %{language_link} + posted_by_html: Diterbitkan oleh %{link_user} pada %{created} dalam %{language_link}. + updated_at_html: Terakhir diperbarui pada %{updated}. comment_link: Komentar di entri ini reply_link: Kirim pesan ke penulis comment_count: @@ -683,6 +673,7 @@ id: office: Bangunan Kantor public: Bangunan Publik residential: Bangunan Perumahan + retail: Bangunan Retail school: Bangunan Sekolah stable: Istal static_caravan: Karavan @@ -1177,9 +1168,11 @@ id: "yes": Jalur Air admin_levels: level2: Batas Negara + level3: Batas Wilayah level4: Batas Negara Bagian level5: Batas Wilayah level6: Batas Provinsi + level7: Batas Munisipalitas level8: Batas Kota/Kabupaten level9: Batas Desa level10: Batas kota pinggiran @@ -1347,12 +1340,21 @@ id: hi: Halo %{to_user}, header: '%{from_user} mengomentari entri terbaru dari catatan harian OpenStreetMap dengan subjek %{subject}:' + header_html: '%{from_user} mengomentari entri dari catatan harian OpenStreetMap + dengan subjek %{subject}:' footer: Anda juga dapat membaca komentar pada %{readurl} dan Anda juga dapat berkomentar pada %{commenturl} atau membalas pada %{replyurl} + footer_html: Anda juga dapat membaca komentar di %{readurl} dan Anda dapat berkomentar + di %{commenturl} atau mengirim pesan kepada penulisnya di %{replyurl} message_notification: + subject: '[OpenStreetMap] %{message_title}' hi: Halo %{to_user}, header: '%{from_user} telah mengirim sebuah pesan kepada Anda melalui OpenStreetMap dengan subjek %{subject}:' + header_html: '%{from_user} telah mengirim sebuah pesan kepada Anda melalui OpenStreetMap + dengan subjek %{subject}:' + footer: Anda juga dapat membaca pesan di %{readurl} dan Anda bisa mengirim pesan + kepada penulis di %{replyurl} footer_html: Anda juga dapat membaca pesan di %{readurl} dan membalasnya di %{replyurl} friendship_notification: @@ -1360,11 +1362,23 @@ id: subject: '[OpenStreetMap] %{user} menambahkan Anda sebagai teman' had_added_you: '%{user} telah menambahkan Anda sebagai teman pada OpenStreetMap.' see_their_profile: Anda dapat melihat profilnya pada %{userurl}. + see_their_profile_html: Anda dapat melihat profil mereka di %{userurl}. befriend_them: Anda juga dapat menambahkannua sebagai teman di %{befriendurl}. + befriend_them_html: Anda juga bisa menambahkan mereka sebagai teman di %{befriendurl}. + gpx_description: + description_with_tags_html: 'Kelihatannya berkas GPX Anda %{trace_name} dengan + deskripsi %{trace_description} dan tag-tag berikut: %{tags}' + description_with_no_tags_html: Kelihatannya berkas GPX Anda %{trace_name} dengan + deskripsi %{trace_description} dan tanpa tag gpx_failure: + hi: Halo %{to_user}, failed_to_import: 'gagal melakukan impor. Berikut ini adalah kesalahannya:' + more_info_html: Informasi lebih lanjut tentang kegagalan impor GPX dan cara + menghindarinya bisa ditemukan di %{url}. + import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures subject: '[OpenStreetMap] gagal impor GPX' gpx_success: + hi: Halo %{to_user}, loaded_successfully: telah berhasil dengan %{trace_points} dari %{possible_points} titik yang mungkin. subject: '[OpenStreetMap] impor GPX sukses' @@ -1379,13 +1393,6 @@ id: informasi tambahan agar Anda dapat segera memulainya. email_confirm: subject: '[OpenStreetMap] Konfirmasi alamat email Anda' - email_confirm_plain: - greeting: Halo, - hopefully_you: Seseorang (semoga saja Anda) ingin mengubah alamat email pada - %{server_url} menjadi %{new_address}. - click_the_link: Jika ini adalah Anda, silahkan klik link di bawah ini untuk - mengkonfirmasi perubahan. - email_confirm_html: greeting: Halo, hopefully_you: Seseorang (semoga saja Anda) ingin mengubah alamat email pada %{server_url} menjadi %{new_address}. @@ -1393,13 +1400,6 @@ id: mengkonfirmasi perubahan. lost_password: subject: '[OpenStreetMap] Permintaan atur ulang sandi' - lost_password_plain: - greeting: Halo, - hopefully_you: Seseorang (kemungkinan Anda) telah meminta untuk mengatur ulang - password pada alamat email dari akun openstreetmap.org ini. - click_the_link: Jika ini Anda, silahkan klik link di bawah ini untuk menyetel - ulang kata sandi. - lost_password_html: greeting: Halo, hopefully_you: Seseorang (kemungkinan Anda) telah meminta untuk mengatur ulang password pada alamat email dari akun openstreetmap.org ini. @@ -1415,8 +1415,12 @@ id: yang Anda minati' your_note: '%{commenter} telah meninggalkan komentar pada salah satu catatan peta Anda dekat %{place}.' + your_note_html: '%{commenter} telah meninggalkan komentar di salah satu catatan + peta Anda dekat %{place}.' commented_note: '%{commenter} memberi komentar pada catatan peta yang Anda komentari. Catatan ini dekat %{place}.' + commented_note_html: '%{commenter} memberi komentar di catatan peta yang Anda + komentari. Catatan ini dekat %{place}.' closed: subject_own: '[OpenStreetMap] %{commenter} telah menyelesaikan salah satu catatan Anda' @@ -1424,8 +1428,12 @@ id: yang Anda minati' your_note: '%{commenter} telah menyelesaikan salah satu catatan peta Anda dekat %{place}.' + your_note_html: '%{commenter} telah menyelesaikan salah satu catatan peta + Anda di dekat %{place}.' commented_note: '%{commenter} telah meninggalkan komentar pada peta catatan yang Anda komentari. Catatan ini dekat %{place}.' + commented_note_html: '%{commenter} telah menyelesaikan salah satu catatan + peta yang Anda komentari. Catatan ini terletak di dekat %{place}.' reopened: subject_own: '[OpenStreetMap] %{commenter} telah mengaktifkan kembali salah satu catatan Anda' @@ -1433,9 +1441,14 @@ id: yang Anda minati' your_note: '%{commenter} telah mengaktifkan kembali salah satu catatan peta Anda dekat %{place}.' + your_note_html: '%{commenter} telah mengaktifkan kembali salah satu catatan + peta Anda di dekat %{place}.' commented_note: '%{commenter} telah meninggalkan komentar pada catatan peta yang Anda komentari. Catatan ini dekat %{place}.' + commented_note_html: '%{commenter} telah mengaktifkan kembali salah satu catatan + peta yang Anda komentari. Catatannya terletak di dekat %{place}.' details: Rincian lebih lanjut mengenai catatan dapat ditemukan di %{url}. + details_html: Rincian lebih lanjut mengenai catatan dapat ditemukan di %{url}. changeset_comment_notification: hi: Halo %{to_user}, greeting: Halo, @@ -1446,13 +1459,22 @@ id: ikuti' your_changeset: '%{commenter} meninggalkan komentar di salah satu perubahan Anda pukul %{time}' + your_changeset_html: '%{commenter} meninggalkan komentar pada %{time} di salah + satu set perubahan Anda' commented_changeset: '%{commenter} meninggalkan komentar di perubahan peta pantauan Anda yang dibuat %{changeset_author} pukul %{time}' + commented_changeset_html: '%{commenter} meninggalkan komentar pada %{time} + di set perubahan yang Anda pantau dan dibuat oleh %{changeset_author}' partial_changeset_with_comment: dengan komentar '%{changeset_comment}' + partial_changeset_with_comment_html: dengan komentar '%{changeset_comment}' partial_changeset_without_comment: tanpa komentar details: Rincian lebuh lanjut soal perubahan ini dapat dilihat di %{url}. + details_html: Rincian lebih lanjut tentang set perubahan ini dapat dilihat di + %{url}. unsubscribe: Untuk berhenti berlangganan pembaruan perubahan set ini, kunjungi %{url} dan kli "Berhenti berlangganan". + unsubscribe_html: Untuk berhenti berlangganan pembaruan perubahan set ini, kunjungi + %{url} dan tekan "Berhenti berlangganan". messages: inbox: title: Kotak Masuk @@ -1605,6 +1627,12 @@ id: cetak), kami menyarankan Anda untuk mengarahkan pembaca Anda pada openstreetmap.org (mungkin dengan memperluas halaman 'OpenStreetMap' secara penuh), untuk opendatacommons.org, dan jika relevan, untuk creativecommons.org. + credit_3_1_html: |- + Tile peta dalam “gaya standar” di www.openstreetmap.org adalah + Karya Produksi oleh OpenStreetMap Foundation menggunakan data OpenStreetMap + di bawah Open Database License. Jika Anda menggunakan tile ini tolong gunakan + atribusi berikut: + “Peta dasar dan data dari OpenStreetMap dan OpenStreetMap Foundation”. credit_4_html: |- Untuk peta elektronik dapat ditelusuri, kredit harus muncul di sudut peta. Sebagai contoh: @@ -1660,6 +1688,11 @@ id: Surveying and Mapping Authority dan Ministry of Agriculture, Forestry and Food (informasi publik Slovenia). + contributors_es_html: |- + Spanyol: Mengandung data yang bersumber dari + Institut Geografi Nasional (IGN) dan + Sistem Kartografi Nasional Spanyol (SCNE) + dilisensikan untuk digunakan kembali di bawah CC BY 4.0. contributors_za_html: |- Afrika Selatan: Berisi data yang bersumber dari Chief Directorate: @@ -1704,17 +1737,6 @@ id: Anda dapat mengatur editan Anda sebagai umum dari halaman %{user_page}. user_page_link: halaman pengguna anon_edits_link_text: Cari tahu mengapa hal ini terjadi. - flash_player_required_html: Anda membutuhkan Flash player untuk menggunakan - Potlatch, penyunting OpenStreetMap berbasis Flash. Anda dapat download - Flash Player from Adobe.com. Beberapa - pilihan lain juga tersedia untuk menyunting OpenStreetMap. - potlatch_unsaved_changes: Anda memiliki perubahan yang belum disimpan. (Untuk - menyimpan di Potlatch, Anda harus membatalkan pilihan garis atau titik saat - ini, jika mengedit dalam modus live, atau klik Simpan jika Anda memiliki tombol - simpan.) - potlatch2_not_configured: Potlatch 2 belum dikonfigurasi - silakan lihat https://wiki.openstreetmap.org/wiki/The_Rails_Port - potlatch2_unsaved_changes: Anda memiliki perubahan yang belum disimpan. (Untuk - menyimpannya dengan Potlatch 2, Anda dapat klik simpan.) id_not_configured: iD belum dikonfigurasikan no_iframe_support: Peramban Anda tidak mendukung iframe HTML yang diperlukan untuk fitur ini. @@ -2090,6 +2112,8 @@ id: require_cookies: cookies_needed: Anda tampaknya memiliki cookies yang tidak aktif - mohon aktifkan cookies pada browser anda sebelum melanjutkan. + require_admin: + not_an_admin: Anda harus merupakan administrator untuk melakukan tindakan itu. setup_user_auth: blocked_zero_hour: Anda mendapat pesan penting di situs web OpenStreetMap. Anda harus membaca pesan tersebut sebelum Anda bisa menyimpan suntingan Anda. diff --git a/config/locales/is.yml b/config/locales/is.yml index 348af0556..582a3d26b 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -184,15 +184,9 @@ is: with_name_html: '%{name} (%{id})' editor: default: Sjálfgefið (núna %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (ritill í vafra) id: name: iD description: iD (ritill í vafra) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (ritill í vafra) remote: name: RC-fjarstýring description: RC-fjarstýring (JOSM eða Merkaartor) @@ -419,12 +413,7 @@ is: new: title: Ný bloggfærsla form: - subject: 'Viðfangsefni:' - body: 'Meginmál:' - language: 'Tungumál:' location: 'Staðsetning:' - latitude: 'Lengdargráða:' - longitude: 'Breiddargráða:' use_map_link: finna á korti index: title: Blogg notenda @@ -1443,7 +1432,6 @@ is: footer: Þú getur einnig lesið athugasemdina á %{readurl} og skrifað athugasemd á %{commenturl} eða sent skilaboð til höfundarins á %{replyurl} message_notification: - subject_header: '[OpenStreetMap] %{subject}' hi: Hæ %{to_user}, header: '%{from_user} hefur send þér skilaboð á OpenStreetMap með titlinum „%{subject}“:' footer_html: Þú getur einnig lesið skilaboðin á %{readurl} og sent skilaboð @@ -1475,13 +1463,6 @@ is: viðbótarupplýsingar til að koma þér í gang. email_confirm: subject: '[OpenStreetMap] Staðfestu netfangið þitt' - email_confirm_plain: - greeting: Hæ, - hopefully_you: Einhver (vonandi þú) vill breyta netfanginu sínu á %{server_url} - í %{new_address}. - click_the_link: Ef þú óskaðir eftir þessari breytingu fylgdu tenglinum hér fyrir - neðan til að staðfesta breytinguna. - email_confirm_html: greeting: Hæ, hopefully_you: Einhver (vonandi þú) vill breyta netfanginu sínu á %{server_url} í %{new_address}. @@ -1489,13 +1470,6 @@ is: neðan til að staðfesta breytinguna. lost_password: subject: '[OpenStreetMap] Beðni um að endurstilla lykilorð' - lost_password_plain: - greeting: Hæ, - hopefully_you: Einhver (vonandi þú) hefur beðið um að endurstilla lykilorðið - á reikningnum með þetta netfang á openstreetmap.org - click_the_link: Ef þú óskaðir eftir þessari endurstillingu fylgdu tenglinum - hér fyrir neðan til að staðfesta breytinguna. - lost_password_html: greeting: Hæ, hopefully_you: Einhver (vonandi þú) hefur beðið um að endurstilla lykilorðið á reikningnum með þetta netfang á openstreetmap.org @@ -1831,17 +1805,6 @@ is: user_page_link: notandasíðunni þinni anon_edits_html: (%{link}) anon_edits_link_text: Finndu út afhverju. - flash_player_required_html: Þú þarft Flash spilara til að nota Potlatch ritilinn, - sem er Flash-ritill fyrir OSM. Þú getur sótt - Flash spilara frá Adobe.com eða notað aðra - OpenStreetMap ritla sem ekki krefjast Flash. - potlatch_unsaved_changes: Þú ert með óvistaðar breytingar. Til að vista í Potlatch - þarf að af-velja núverandi val ef þú ert í „Live“-ham, eða ýta á „Save“ hnappinn - til að vista ef sá hnappur er sjáanlegur. - potlatch2_not_configured: Potlatch 2 hefur ekki verið stillt - skoðaðu https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 - til að sjá nánari upplýsingar - potlatch2_unsaved_changes: Þú ert með óvistaðar breytingar. (Til að vista í - Potlatch 2 ættirðu að ýta á vistunarhnappinn.) id_not_configured: Það er ekki búið að setja upp auðkenni no_iframe_support: Því miður styður vafrinn þinn ekki HTML-iframes, sem er nauðsynlegt ef nota á þennan eiginleika. diff --git a/config/locales/it.yml b/config/locales/it.yml index cf90f26ee..b09b0ce3c 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -220,18 +220,12 @@ it: other: '%{count} anni fa' editor: default: Predefinito (al momento %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (editor nel browser) id: name: iD description: iD (editor nel browser) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (editor nel browser) remote: name: Controllo remoto - description: Controllo remoto (JOSM o Merkaartor) + description: Controllo remoto (JOSM, Potlatch, Merkaartor) auth: providers: none: Nessuno @@ -452,13 +446,8 @@ it: new: title: Nuova voce del diario form: - subject: 'Oggetto:' - body: 'Testo:' - language: 'Lingua:' - location: 'Luogo:' - latitude: 'Latitudine:' - longitude: 'Longitudine:' - use_map_link: utilizza mappa + location: Località + use_map_link: Utilizza mappa index: title: Diari degli utenti title_friends: Diari degli amici @@ -1464,13 +1453,21 @@ it: hi: Ciao %{to_user}, header: '%{from_user} ha commentato la voce del diario OpenStreetMap con l''oggetto %{subject}:' + header_html: '%{from_user} ha commentato la voce del diario OpenStreetMap con + l''oggetto %{subject}:' footer: Puoi anche leggere il commento su %{readurl} e puoi commentare su %{commenturl} oppure inviare un messaggio all'autore su %{replyurl} + footer_html: Puoi anche leggere il commento su %{readurl} e puoi commentare + su %{commenturl} oppure inviare un messaggio all'autore su %{replyurl} message_notification: - subject_header: '[OpenStreetMap] %{subject}' + subject: '[OpenStreetMap] %{message_title}' hi: Ciao %{to_user}, header: '%{from_user} ti ha inviato un messaggio tramite OpenStreetMap con l''oggetto %{subject}:' + header_html: '%{from_user} ti ha inviato un messaggio tramite OpenStreetMap + con l''oggetto %{subject}:' + footer: Puoi anche leggere il messaggio al %{readurl} e puoi inviare un messaggio + all'autore al %{replyurl} footer_html: Puoi anche leggere il messaggio al %{readurl} e puoi inviare un messaggio all'autore al %{replyurl} friendship_notification: @@ -1478,7 +1475,9 @@ it: subject: '[OpenStreetMap] %{user} ti ha aggiunto come amico' had_added_you: '%{user} ti ha aggiunto come suo amico su OpenStreetMap.' see_their_profile: Puoi vedere il suo profilo su %{userurl}. + see_their_profile_html: Puoi vedere il suo profilo su %{userurl}. befriend_them: Puoi anche aggiungerli come amici in %{befriendurl}. + befriend_them_html: Puoi anche aggiungerli come amici in %{befriendurl}. gpx_failure: hi: Ciao %{to_user}, failed_to_import: 'fallito nell''importazione. Questo è l''errore:' @@ -1502,34 +1501,19 @@ it: aggiuntive per consentirti di iniziare. email_confirm: subject: '[OpenStreetMap] Conferma il tuo indirizzo email' - email_confirm_plain: greeting: Ciao, hopefully_you: Qualcuno (si spera proprio tu) vuole modificare il tuo indirizzo di posta elettronica su %{server_url} con il nuovo indirizzo %{new_address}. click_the_link: Se questo sei proprio tu, per favore clicca sul collegamento sottostante per confermare il cambiamento. - email_confirm_html: - greeting: Ciao, - hopefully_you: Qualcuno (si spera proprio tu) vuole modificare il tuo indirizzo - di posta elettronica su %{server_url} con il nuovo indirizzo %{new_address}. - click_the_link: Se sei tu, per favore clicca il link sotto per confermare le - variazioni. lost_password: subject: '[OpenStreetMap] Richiesta nuova password' - lost_password_plain: greeting: Ciao, hopefully_you: Qualcuno (probabilmente tu stesso) ha chiesto di resettare la password del profilo utente di openstreetmap.org associato a questo indirizzo di posta elettronica. click_the_link: Se sei tu, per favore clicca sul link sotto per resettare la password - lost_password_html: - greeting: Ciao, - hopefully_you: Qualcuno (probabilmente tu stesso) ha richiesto che la tua password - sia impostata nuovamente su questo indirizzo di posta elettronica associato - al profilo utente di openstreetmap.org. - click_the_link: Se sei proprio tu, per favore clicca sul collegamento sottostante - per impostare nuovamente la tua password. note_comment_notification: anonymous: Un utente anonimo greeting: Ciao, @@ -1539,23 +1523,35 @@ it: cui sei interessato' your_note: '%{commenter} ha lasciato un commento su una delle tue note sulla mappa vicina a %{place}.' + your_note_html: '%{commenter} ha lasciato un commento su una delle tue note + sulla mappa vicina a %{place}.' commented_note: '%{commenter} ha lasciato un commento su una nota sulla mappa da te commentata. La nota è vicina a %{place}.' + commented_note_html: '%{commenter} ha lasciato un commento su una nota sulla + mappa da te commentata. La nota è vicina a %{place}.' closed: subject_own: '[OpenStreetMap] %{commenter} ha chiuso una delle tue note' subject_other: '[OpenStreetMap] %{commenter} ha chiuso una nota cui sei interessato' your_note: '%{commenter} ha chiuso una delle tue note sulla mappa vicina a %{place}.' + your_note_html: '%{commenter} ha chiuso una delle tue note sulla mappa vicina + a %{place}.' commented_note: '%{commenter} ha chiuso una nota sulla mappa da te commentata. La nota è vicina a %{place}.' + commented_note_html: '%{commenter} ha chiuso una nota sulla mappa da te commentata. + La nota è vicina a %{place}.' reopened: subject_own: '[OpenStreetMap] %{commenter} ha riattivato una delle tue note' subject_other: '[OpenStreetMap] %{commenter} ha riattivato una nota a cui eri interesssato' - your_note: '%{commenter}ha riattivato una delle tue note vicino a %{place}.' + your_note: '%{commenter} ha riattivato una delle tue note vicino a %{place}.' + your_note_html: '%{commenter} ha riattivato una delle tue note vicino a %{place}.' commented_note: '%{commenter} ha riattivato una nota che avevi commentato. La nota si trova vicino a %{place}.' + commented_note_html: '%{commenter} ha riattivato una nota che avevi commentato. + La nota si trova vicino a %{place}.' details: Ulteriori dettagli sulla nota possono essere trovati su %{url}. + details_html: Ulteriori dettagli sulla nota possono essere trovati su %{url}. changeset_comment_notification: hi: Ciao %{to_user}, greeting: Ciao, @@ -1565,14 +1561,23 @@ it: cui sei interessato' your_changeset: '%{commenter} ha lasciato un commento alle %{time} su uno dei tuoi gruppo di modifiche' + your_changeset_html: '%{commenter} ha lasciato un commento alle %{time} su + uno dei tuoi gruppo di modifiche' commented_changeset: In data %{time}, %{commenter} ha lasciato un commento alle %{time} su un gruppo di modifiche che stai osservando creato da %{changeset_author} + commented_changeset_html: In data %{time}, %{commenter} ha lasciato un commento + alle %{time} su un gruppo di modifiche che stai osservando creato da %{changeset_author} partial_changeset_with_comment: con il commento '%{changeset_comment}' + partial_changeset_with_comment_html: con il commento '%{changeset_comment}' partial_changeset_without_comment: senza commento details: Ulteriori dettagli sul gruppo di modifiche possono essere trovati su %{url}. + details_html: Ulteriori dettagli sul gruppo di modifiche possono essere trovati + su %{url}. unsubscribe: Per cancellarsi dagli aggiornamenti di questo insieme di modifiche, visita %{url} e fai clic su "Cancellazione". + unsubscribe_html: Per cancellarsi dagli aggiornamenti di questo insieme di modifiche, + visita %{url} e fai clic su "Cancellazione". messages: inbox: title: Posta in arrivo @@ -1648,6 +1653,22 @@ it: as_unread: Messaggio marcato come non letto destroy: destroyed: Messaggio eliminato + shared: + markdown_help: + title_html: Analizzato con kramdown + headings: Intestazioni + heading: Intestazione + subheading: Sottotitolo + unordered: Elenco puntato + ordered: Elenco ordinato + link: Collegamento + text: Testo + image: Immagine + alt: Testo alternativo + url: URL + richtext_field: + edit: Modifica + preview: Anteprima site: about: next: Successivo @@ -1835,18 +1856,6 @@ it: %{user_page}. user_page_link: pagina utente anon_edits_link_text: Leggi il perché. - flash_player_required_html: È necessario un visualizzatore Flash per utilizzare - Potlatch, il programma Flash per le modifiche di OpenStreetMap. Si può scaricare il Flash Player da Adobe.com. - Sono disponibili anche altre - possibilità per apportare modifiche a OpenStreetMap. - potlatch_unsaved_changes: Ci sono modifiche non salvate. (Per salvare in Potlatch, - si dovrebbe deselezionare il percorso o nodo corrente, se si sta editando - nella modalità 'list', o cliccare sul bottone salva se presente.) - potlatch2_not_configured: Potlatch 2 non è stato configurato - vedi https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 - per ulteriori informazioni - potlatch2_unsaved_changes: Ci sono delle modifiche non salvate. (Per salvare - in Potlatch 2 è necessario premere il tasto di salvataggio.) id_not_configured: iD non è stato configurato no_iframe_support: Il proprio browser non supporta gli iframe HTML, necessari per questa funzionalità. @@ -2805,7 +2814,7 @@ it: title: Condividi cancel: Annulla image: Immagine - link: Link o HTML + link: Collegamento o HTML long_link: Link short_link: Link breve geo_uri: Geo URI diff --git a/config/locales/ja.yml b/config/locales/ja.yml index dbc407279..d28ec6afe 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -7,6 +7,7 @@ # Author: Atysn # Author: CmplstofB # Author: Endres +# Author: Foomin10 # Author: Fryed-peach # Author: Hayashi # Author: Higa4 @@ -218,15 +219,9 @@ ja: with_name_html: '%{name} (%{id})' editor: default: 既定 (現在は %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (ブラウザー内エディター) id: name: iD description: iD (ブラウザー内エディター) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (ブラウザー内エディター) remote: name: リモート制御 description: 遠隔制御 (JOSM または Merkaartor) @@ -439,12 +434,7 @@ ja: new: title: 日記エントリの新規作成 form: - subject: 'タイトル:' - body: '本文:' - language: '言語:' - location: '位置:' - latitude: '緯度:' - longitude: '経度:' + location: 位置 use_map_link: 地図を使用 index: title: 利用者さんの日記 @@ -473,7 +463,8 @@ ja: heading: ID %{id} にコメントはまだありません。 body: ID が %{id} のコメントや日記は存在しません。URLにスペルミスがないか確認をしてください。またはリンク元が間違っています。 diary_entry: - posted_by_html: '%{link_user} が %{created} に投稿 (%{language_link})' + posted_by_html: '%{link_user} が %{created} に投稿 (%{language_link}) 。' + updated_at_html: 最終更新日は %{updated} comment_link: このエントリにコメント reply_link: 筆者にメッセージを送る comment_count: @@ -1440,10 +1431,15 @@ ja: subject: '[OpenStreetMap]の%{user}さんが日記エントリにコメントしました' hi: こんにちは、%{to_user} さん。 header: 'OpenStreetMap 日記エントリ (タイトル: %{subject}) に、%{from_user} がコメントしました。' + header_html: 'OpenStreetMap 日記エントリ (タイトル: %{subject}) に、%{from_user} がコメントしました。' footer: '%{readurl}でコメントを読み、%{commenturl} でコメントし、%{replyurl} で筆者へメッセージを送信することができます。' + footer_html: '%{readurl}でコメントを読み、%{commenturl} でコメントし、%{replyurl} で筆者へメッセージを送信することができます。' message_notification: + subject: '[OpenStreetMap] %{message_title}' hi: こんにちは、%{to_user} さん。 header: '%{from_user} さんが、OpenStreetMap であなたに件名 %{subject} のメッセージを送信しました:' + header_html: '%{from_user} さんが、OpenStreetMap であなたに件名 %{subject} のメッセージを送信しました:' + footer: メッセージを読むにはこちら %{readurl}、筆者に返信するにはこちら %{replyurl} footer_html: メッセージを読むにはこちら %{readurl}、筆者に返信するにはこちら %{replyurl} friendship_notification: hi: '%{to_user},' @@ -1451,10 +1447,13 @@ ja: had_added_you: OpenStreetMap で %{user} さんがあなたを友達に追加しました。 see_their_profile: '%{userurl} でプロフィールを閲覧できます。' befriend_them: '%{befriendurl} で友達になることができます。' + befriend_them_html: '%{befriendurl} で友達になることができます。' gpx_failure: failed_to_import: 'インポートするのに失敗しました。エラーはここです。:' + more_info_html: GPXインポートの失敗とその回避方法についての詳細は、%{url}に記載されています。 subject: '[OpenStreetMap] GPX のインポートが失敗' gpx_success: + hi: こんにちは、%{to_user} さん。 loaded_successfully: other: 利用可能な点 %{possible_points} 個のうち、%{trace_points} 個の読み込みに成功しました。 subject: '[OpenStreetMap] GPX のインポートが成功' @@ -1466,21 +1465,11 @@ ja: welcome: アカウントを確認したあと、開始するための追加情報を提供します。 email_confirm: subject: '[OpenStreetMap] あなたのメール アドレスの確認' - email_confirm_plain: greeting: こんにちは。 hopefully_you: 誰か (おそらくあなた) が %{server_url} で、メール アドレスを %{new_address} に変更しようとしています。 click_the_link: この要求を出したのがあなたなら、下のリンクをクリックして、変更の認証をしてください。 - email_confirm_html: - greeting: こんにちは、 - hopefully_you: 誰か (おそらくあなた) が %{server_url} で、メール アドレスを %{new_address} に変更しようとしています。 - click_the_link: これがあなたであれば、以下のリンクをクリックして変更を確認してください。 lost_password: subject: '[OpenStreetMap] パスワードリセットの要求' - lost_password_plain: - greeting: こんにちは、 - hopefully_you: 誰か (おそらくあなた) が、このメール アドレスの openstreetmap.org アカウントに対するパスワードをリセットするように依頼しました。 - click_the_link: これがあなたであれば、以下のリンクをクリックしてパスワードをリセットしてください。 - lost_password_html: greeting: こんにちは、 hopefully_you: 誰か (おそらくあなた) が、このメール アドレスの openstreetmap.org アカウントに対するパスワードをリセットするように依頼しました。 click_the_link: これがあなたであれば、以下のリンクをクリックしてパスワードをリセットしてください。 @@ -1491,18 +1480,25 @@ ja: subject_own: '[OpenStreetMap] %{commenter} さんがあなたのメモにコメントしました' subject_other: '[OpenStreetMap] %{commenter}さんがあなたが関心を持っているメモにコメントしました' your_note: '%{commenter}さんが%{place}付近にあるあなたの地図メモの1つにコメントを残しました。' + your_note_html: '%{commenter}さんが%{place}付近にあるあなたの地図メモの1つにコメントを残しました。' commented_note: '%{commenter}さんがあなたがコメントした地図上の%{place}付近にあるメモにコメントしました。' + commented_note_html: '%{commenter}さんがあなたがコメントした地図上の%{place}付近にあるメモにコメントしました。' closed: subject_own: '[OpenStreetMap] %{commenter} さんがあなたのメモを解決しました' subject_other: '[OpenStreetMap] %{commenter}さんが、あなたが関心を持っているメモを解決しました' your_note: '%{commenter}さんが%{place}付近にあるあなたの地図メモの1つを解決しました。' + your_note_html: '%{commenter}さんが%{place}付近にあるあなたの地図メモの1つを解決しました。' commented_note: '%{commenter}さんが、あなたがコメントした地図上の%{place}付近にあるメモを解決しました。' + commented_note_html: '%{commenter}さんが、あなたがコメントした地図上の%{place}付近にあるメモを解決しました。' reopened: subject_own: '[OpenStreetMap] %{commenter}さんがあなたのメモの1つを再開しました' subject_other: '[OpenStreetMap] %{commenter}さんがあなたが関心を持っているメモを再開しました' your_note: '%{commenter}さんが%{place}付近にあるあなたの地図メモの1つを再開しました。' + your_note_html: '%{commenter}さんが%{place}付近にあるあなたの地図メモの1つを再開しました。' commented_note: '%{commenter}さんが、%{place}付近にあるあなたがコメントした地図メモを再開しました。' + commented_note_html: '%{commenter}さんが、%{place}付近にあるあなたがコメントした地図メモを再開しました。' details: メモについての詳細は %{url} を参照。 + details_html: メモについての詳細は %{url} を参照。 changeset_comment_notification: hi: こんにちは、%{to_user} さん。 greeting: こんにちは、 @@ -1510,11 +1506,16 @@ ja: subject_own: '[OpenStreetMap] %{commenter} さんがあなたの変更セットにコメントしました' subject_other: '[OpenStreetMap] %{commenter}さんがあなたが関心を持っているメモにコメントしました' your_changeset: '%{commenter}さんが%{time}にあなたの変更セットにコメントしました' + your_changeset_html: '%{commenter}さんが%{time}にあなたの変更セットにコメントしました' commented_changeset: '%{commenter}さんが%{time}に、%{changeset_author}さんが作成したあなたが監視中の変更セットにコメントしました' + commented_changeset_html: '%{commenter}さんが%{time}に、%{changeset_author}さんが作成したあなたが監視中の変更セットにコメントしました' partial_changeset_with_comment: 「%{changeset_comment}」に対するコメント + partial_changeset_with_comment_html: 「%{changeset_comment}」に対するコメント partial_changeset_without_comment: コメントなし details: 変更セットについての詳細は %{url} を参照。 + details_html: 変更セットについての詳細は %{url} を参照。 unsubscribe: この変更セットの購読を中止するには%{url}を開いて"購読を中止 Unsubscribe"をクリック。 + unsubscribe_html: この変更セットの購読を中止するには%{url}を開いて「購読を中止」をクリック。 messages: inbox: title: 受信箱 @@ -1580,6 +1581,10 @@ ja: as_unread: 未読メッセージ destroy: destroyed: メッセージを削除しました + shared: + markdown_help: + title_html: kramdownで構文解析します + url: URL site: about: next: 次へ @@ -1705,12 +1710,6 @@ ja: not_public_description_html: このようなことをしない限り、あなたは地図を編集できません。あなたは%{user_page}から編集内容を公開できます。 user_page_link: ユーザーページ anon_edits_link_text: なぜこれれが事例なのかを見る。 - flash_player_required_html: Flash 版 OpenStreetMap エディターである Potlatch を使用するには、Flash - Player が必要です。Flash Player はAdobe.com - でダウンロードできます。OpenStreetMap を編集する他の方法もあります。 - potlatch_unsaved_changes: 保存していない変更があります。(Potlatch では、一覧モードで編集している場合、ウェイや点の選択を解除する必要があります。または、保存ボタンをクリックして保存してください。) - potlatch2_not_configured: 'Potlatch 2 が設定されていません - 詳細情報はこちらをご覧ください: https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2' - potlatch2_unsaved_changes: 保存していない変更があります。(Potlatch 2 では、保存をクリックして保存する必要があります。) id_not_configured: iDが設定されていません。 no_iframe_support: あなたのブラウザーは、この機能に必須の HTML iframe に未対応です。 export: diff --git a/config/locales/ka.yml b/config/locales/ka.yml index 102fcde77..47a8e5d3f 100644 --- a/config/locales/ka.yml +++ b/config/locales/ka.yml @@ -102,15 +102,9 @@ ka: tagstring: მძიმის შემდეგ editor: default: უპირობოდ (ამჟამად %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (ბრაუზერის რედაქტორი) id: name: iD description: iD (ბრაუზერის რედაქტორი) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (ბრაუზერის რედაქტორი) remote: name: დისტანციური მართვა description: დისტანციური მათვა (JOSM, ან Merkaartor) @@ -241,12 +235,7 @@ ka: new: title: დღიურში ახალი ჩანაწერის გაკეთება form: - subject: 'თემა:' - body: 'ტექსტი:' - language: 'ენა:' location: 'მდებარეობა:' - latitude: 'განედი:' - longitude: 'გრძედი:' use_map_link: რუკაზე ჩვენება index: title: მომხმარებლების დღიურები @@ -788,13 +777,8 @@ ka: greeting: გამარჯობა! email_confirm: subject: '[OpenStreetMap] დაადასტურეთ თქვენი ელ.ფოსტის მისამართი' - email_confirm_plain: - greeting: გამარჯობა, - email_confirm_html: greeting: გამარჯობა, - lost_password_plain: - greeting: გამარჯობა, - lost_password_html: + lost_password: greeting: გამარჯობა, note_comment_notification: anonymous: ანონიმური მომხმარებელი diff --git a/config/locales/kab.yml b/config/locales/kab.yml index 0f4f41f57..ebe9848d6 100644 --- a/config/locales/kab.yml +++ b/config/locales/kab.yml @@ -5,6 +5,7 @@ # Author: Alem # Author: Amsideg # Author: Belkacem77 +# Author: Bilalbill # Author: K Messaoudi # Author: Marzuquccen # Author: Mastanabal @@ -18,6 +19,8 @@ kab: formats: friendly: '%e %B %Y É£ef %H:%M' helpers: + file: + prompt: Fren afaylu submit: diary_comment: create: Sekles @@ -30,7 +33,10 @@ kab: create: Azen client_application: create: Sekles - update: Ẓreg + update: Setrer + redaction: + create: Snulfu tirra + update: Kles tirra trace: create: Sali update: Sekles ibeddilen @@ -38,6 +44,9 @@ kab: create: Rnu iḥder update: Beddel iḥder activerecord: + errors: + messages: + invalid_email_address: Ur yettbin ara d tansa n imayl taÉ£balt models: acl: Tabdart n usenqed n unekcum changeset: Agraw n ibeddilen @@ -76,8 +85,11 @@ kab: way_tag: Imyerr n ubrid attributes: client_application: + name: Isem (D usfik) + url: URL n usnas agejdan (D usfik) callback_url: Tansa URL n usmekti support_url: Tansa URL n tallelt + allow_write_api: Ẓreg tagertilt diary_comment: body: Tafekka diary_entry: @@ -111,20 +123,18 @@ kab: description: Aglam languages: Tutlayin pass_crypt: Awal uffir + pass_crypt_confirmation: Sentem awal uffir + help: + trace: + tagstring: Ticcert yettulessesen datetime: distance_in_words_ago: half_a_minute: Azgen n tsedast aya editor: default: Amezwer (tura %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (amaẓrag ineṭḍen deg iminig) id: name: iD description: iD (yeddan deg iminig) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (amaẓrag ineṭḍen deg iminig) remote: name: Amaẓrag azÉ£aray description: Amaẓrag azÉ£aray (JOSM neÉ£ Merkaartor) @@ -338,12 +348,7 @@ kab: new: title: Anekcam amaynut n uÉ£mis form: - subject: 'Asentel:' - body: 'Tafekka:' - language: 'Tutlayt:' location: 'Adig:' - latitude: 'Tarrut:' - longitude: 'Tazegrart:' use_map_link: seqdec takarḍa index: title: IÉ£misen n useqdac @@ -812,17 +817,11 @@ kab: created: Yella win (nessaram d kečč) yernan amiḍan É£ef %{site_url}. email_confirm: subject: '[OpenStreetMap] Sentem tansa-ik imayl' - email_confirm_plain: - greeting: Azul, - email_confirm_html: greeting: Azul, lost_password: subject: '[OpenStreetMap] Asuter n tulsa n uwennez n wawal uffir' - lost_password_plain: greeting: Azul, click_the_link: Ma d kečč, sit É£ef useÉ£wen akken ad talseḍ awennez n wawal uffir. - lost_password_html: - greeting: Azul, note_comment_notification: anonymous: Aseqdac udrig greeting: Azul, diff --git a/config/locales/km.yml b/config/locales/km.yml index 0de3cad37..75bfb2f5e 100644 --- a/config/locales/km.yml +++ b/config/locales/km.yml @@ -203,12 +203,7 @@ km: new: title: ប្រកាសកំណត់ហេតុថ្មី form: - subject: ប្រធានបទ​៖ - body: តួ​សេចក្ដី​៖ - language: ភាសា​៖ location: ទីតាំង​៖ - latitude: រយៈកម្ពស់៖ - longitude: រយៈបណ្តោយ៖ use_map_link: ប្រើផែនទី​ index: title: កំណត់ហេតុរបស់អ្នកប្រើប្រាស់ @@ -637,13 +632,8 @@ km: subject: '[OpenStreetMap] សូមស្វាគមន៍មកកាន់ OpenStreetMap' email_confirm: subject: '[OpenStreetMap] បញ្ជាក់​អាសយដ្ឋាន​អ៊ីមែលរបស់អ្នក​' - email_confirm_plain: greeting: សួស្ដី, - email_confirm_html: - greeting: សួស្ដី​, - lost_password_plain: - greeting: សួស្ដី, - lost_password_html: + lost_password: greeting: សួស្ដី​, messages: inbox: diff --git a/config/locales/ko.yml b/config/locales/ko.yml index b0401195b..6c18157be 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -183,18 +183,12 @@ ko: x_years: '%{count}년 전' editor: default: 기본값 (현재 %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (브라우저 내 편집기) id: name: iD description: iD (브라우저 내 편집기) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (브라우저 내 편집기) remote: name: 원격 제어 - description: 원격 제어 (JOSM 또는 Merkaartor) + description: 원격 제어 (JOSM, Potlatch, Merkaartor) auth: providers: none: 없음 @@ -399,12 +393,7 @@ ko: new: title: 새 일기 항목 form: - subject: '제목:' - body: '본문:' - language: '언어:' - location: '위치:' - latitude: '위도:' - longitude: '경도:' + location: 위치 use_map_link: 지도 사용 index: title: 사용자의 일기 @@ -517,6 +506,7 @@ ko: holding_position: 정지 위치 parking_position: 주차 위치 runway: 활주로 + taxilane: 유도선 taxiway: 유도로 terminal: 터미널 amenity: @@ -529,7 +519,9 @@ ko: bench: 벤치 bicycle_parking: 자전거 주차장 bicycle_rental: 자전거 대여 + bicycle_repair_station: 자전거 수리소 biergarten: 옥외 탁자 + blood_bank: 혈액 보관소 boat_rental: 보트 대여점 brothel: 매음굴 bureau_de_change: 환전소 @@ -546,6 +538,7 @@ ko: clock: 시계 college: 전문대학 community_centre: 커뮤니티 센터 + conference_centre: 컨퍼런스 센터 courthouse: 법원 crematorium: 화장장 dentist: 치과 @@ -567,16 +560,20 @@ ko: ice_cream: 아이스크림 internet_cafe: 인터넷 카페 kindergarten: 유치원 + language_school: 언어 학교 library: 도서관 + loading_dock: 적재용 독 love_hotel: 러브 호텔 marketplace: 시장 monastery: 수도원 motorcycle_parking: 오토바이 주차장 + music_school: 음악 학교 nightclub: 나이트 클럽 nursing_home: 복지관 parking: 주차장 parking_entrance: 주차장 입구 parking_space: 주차 공간 + payment_terminal: 결제 터미널 pharmacy: 약국 place_of_worship: 예배당 police: 경찰서 @@ -584,7 +581,10 @@ ko: post_office: 우체국 prison: 교도소 pub: 술집 + public_bath: 공공 욕실 + public_bookcase: 공공 책장 public_building: 공공 건물 + ranger_station: 레인저 스테이션 recycling: 재활용장 restaurant: 음식점 school: 학교 @@ -605,12 +605,15 @@ ko: village_hall: 커뮤니티 센터 waste_basket: 쓰레기통 waste_disposal: 폐기물 처리장 + watering_place: 급수지 water_point: 워터 포인트 boundary: administrative: 행정 구역 경계 census: 인구조사 구역 경계 national_park: 국립 공원 + political: 선거구 경계 protected_area: 보호 구역 + "yes": 경계 bridge: aqueduct: 수도교 boardwalk: 보드워크 @@ -621,33 +624,63 @@ ko: building: apartment: 아파트 apartments: 아파트 + barn: 외양간 + bungalow: 방갈로 + cabin: 오두막 + chapel: 예배당 church: 교회 건물 + civic: 시민 건물 + college: 대학 건물 commercial: 상업용 건물 + construction: 건설 중인 건물 dormitory: 기숙사 + duplex: 땅콩집 farm: 농가 garage: 차고 + garages: 차고 + greenhouse: 온실 + hangar: 격납고 hospital: 병원 hotel: 호텔 건물 house: 주택 + houseboat: 거주형 선박 + hut: 소형 오두막 industrial: 산업용 건물 + kindergarten: 유치원 건물 + manufacture: 생산 건물 office: 사무실 건물 public: 공공 건축물 + residential: 주거 건물 retail: 소매점 건물 + roof: 지붕 + ruins: 폐허가 된 건물 school: 학교 건물 + service: 서비스 건물 terrace: 테라스 건물 train_station: 철도역 건물 university: 대학 건물 + warehouse: 저장고 "yes": 건물 + club: + sport: 스포츠 클럽 + "yes": 클럽 craft: + beekeper: 양봉장 + blacksmith: 대장간 brewery: 맥주 공장 carpenter: 목공 + caterer: 조리소 + dressmaker: 양장점 electrician: 전기공 + electronics_repair: 전자제품 수리점 gardener: 정원사 + glaziery: 유리 공장 painter: 화가 photographer: 사진 작가 plumber: 배관공 shoemaker: 구두공 tailor: 재단사 + winery: 포도주 양조장 "yes": 공예품점 emergency: ambulance_station: 구급 의료 센터 @@ -704,12 +737,15 @@ ko: unclassified: 분류되지 않은 도로 "yes": 도로 historic: + aircraft: 역사적인 항공기 archaeological_site: 유적지 battlefield: 전쟁터 boundary_stone: 경계석 building: 역사적 건물 bunker: 벙커 + cannon: 역사적인 대포 castle: 성 + charcoal_pile: 역사적인 숯더미 church: 교회 city_gate: 성문 citywalls: 성벽 @@ -721,6 +757,7 @@ ko: mine: 광산 mine_shaft: 탄갱 monument: 기념물 + railway: 역사적인 철도 roman_road: 로마 도로 ruins: 폐허 stone: 돌 @@ -766,7 +803,9 @@ ko: leisure: beach_resort: 해수욕장 bird_hide: 조류 관찰소 + bowling_alley: 볼링장 common: 공유지 + dance: 댄스 홀 dog_park: 반려견 공원 firepit: 화로 fishing: 낚시터 @@ -779,7 +818,9 @@ ko: marina: 정박지 miniature_golf: 미니어처 골프 nature_reserve: 자연 보호구역 + outdoor_seating: 야외 좌석 park: 공원 + picnic_table: 피크닉 테이블 pitch: 운동장 playground: 놀이터 recreation_ground: 놀이 공원 @@ -801,6 +842,7 @@ ko: bunker_silo: 벙커 chimney: 굴뚝 crane: 기중기 + cross: 교차로 dolphin: 계선주 dyke: 제방 embankment: 둑 @@ -809,6 +851,7 @@ ko: groyne: 제방 kiln: 가마 lighthouse: 등대 + manhole: 맨홀 mast: 돛대 mine: 광산 mineshaft: 갱도 @@ -816,12 +859,17 @@ ko: petroleum_well: 유정 pier: 부두 pipeline: 파이프라인 + pumping_station: 펌프 스테이션 silo: 사일로 + snow_cannon: 인공 눈 제작 기계 storage_tank: 저장 탱크 surveillance: 감시카메라 + telescope: 망원경 tower: 탑 + utility_pole: 전봇대 wastewater_plant: 폐수처리장 watermill: 물레방아 + water_tap: 수도꼭지 water_tower: 급수탑 water_well: 우물 water_works: 상수도 @@ -832,6 +880,8 @@ ko: airfield: 군용 비행장 barracks: 막사 bunker: 벙커 + checkpoint: 검문소 + trench: 참호 "yes": 군대 mountain_pass: "yes": 산길 @@ -874,6 +924,7 @@ ko: water: 물 wetland: 습지 wood: 산림 + "yes": 자연 office: accountant: 공인회계사 사무소 administrative: 관리 @@ -882,12 +933,15 @@ ko: company: 회사 educational_institution: 교육 기관 employment_agency: 직업 소개소 + energy_supplier: 전력 공급 업체 사무실 estate_agent: 부동산 중개 + financial: 금융 업체 사무실 government: 정부 기관 insurance: 보험 회사 사옥 it: IT 오피스 lawyer: 변호사 사무실 ngo: 비정부 기구 사무실 + tax_advisor: 세무사 telecommunication: 통신 회사 사옥 travel_agent: 여행사 "yes": 사옥 @@ -946,7 +1000,10 @@ ko: alcohol: 주점 antiques: 골동품 상점 art: 예술품 가게 + baby_goods: 유아용품 + bag: 가방 판매점 bakery: 제과점 + bathroom_furnishing: 욕실 설치 업체 beauty: 미용실 beverages: 음료 가게 bicycle: 자전거 가게 @@ -959,19 +1016,27 @@ ko: car_repair: 자동차 수리점 carpet: 카펫 가게 charity: 자선 가게 + cheese: 치즈 상점 chemist: 약국 + chocolate: 초콜릿 clothes: 의류 상점 + coffee: 커피 상점 computer: 컴퓨터 상점 confectionery: 과자 가게 convenience: 편의점 copyshop: 복사점 cosmetics: 화장품 상점 + craft: 공예품 공급점 + curtain: 커튼 상점 + dairy: 유제품 상점 deli: 델리카트슨 department_store: 백화점 discount: 할인점 doityourself: DIY dry_cleaning: 드라이클리닝 + e-cigarette: 전자담배 상점 electronics: 전자 제품 가게 + erotic: 성인용품점 estate_agent: 공인 중개사 farm: 농장 가게 fashion: 패션 상점 @@ -980,12 +1045,16 @@ ko: funeral_directors: 장례식장 furniture: 가구점 garden_centre: 원예 용품점 + gas: 유류점 general: 일반 상점 gift: 선물 가게 greengrocer: 청과상 grocery: 식료품 상점 hairdresser: 미용실 hardware: 철물점 + health_food: 건강 식품 판매점 + hearing_aids: 보청기 + herbalist: 약초 상점 hifi: 고급 오디오 houseware: 가정용품 상점 ice_cream: 아이스크림 가게 @@ -994,27 +1063,38 @@ ko: kiosk: 키오스크 숍 kitchen: 주방용품점 laundry: 세탁소 + locksmith: 자물쇠 상점 lottery: 복권 mall: 쇼핑몰 massage: 안마시술소 + medical_supply: 의료용품 공급점 mobile_phone: 휴대폰 상점 motorcycle: 이륜자동차(오토바이) 상점 + motorcycle_repair: 오토바이 수리점 music: 음반 가게 + musical_instrument: 악기 판매점 newsagent: 신문 판매소 + nutrition_supplements: 영양 보충제 판매점 optician: 안경점 organic: 유기농 식품 상점 outdoor: 아웃도어 상점 paint: 페인트 가게 + pastry: 제과점 pawnbroker: 전당포 + perfumery: 향수 판매점 pet: 애완 동물 가게 + pet_grooming: 반려동물 미용점 photo: 사진관 seafood: 해산물 second_hand: 중고품 가게 + sewing: 재봉소 shoes: 신발 가게 sports: 스포츠용품점 stationery: 문구점 supermarket: 수퍼마켓 tailor: 양복점 + tattoo: 문신소 + tea: 다방 ticket: 매표소 tobacco: 담배 가게 toys: 완구점 @@ -1023,6 +1103,7 @@ ko: vacant: 비어있는 가게 variety_store: 잡화점 video: 비디오 가게 + video_games: 게임 판매점 wine: 와인 상점 "yes": 상점 tourism: @@ -1241,19 +1322,24 @@ ko: footer: '%{readurl}에서 댓글을 읽을 수가 있으며, %{commenturl}에서 댓글을 남기거나 %{replyurl}에서 저자에게 메시지를 보낼 수 있습니다.' message_notification: + subject: '[오픈스트리트맵] %{message_title}' hi: 안녕하세요 %{to_user}님, header: '%{from_user}님이 OpenStreetMap을 통해 %{subject} 제목으로 된 메시지를 보냈습니다:' + header_html: '%{from_user}님이 OpenStreetMap을 통해 %{subject} 제목으로 된 메시지를 보냈습니다:' footer_html: 또한 %{readurl}에서 메시지를 읽을 수 있고 %{replyurl}에서 저자에게 메시지를 보낼 수 있습니다. friendship_notification: hi: 안녕하세요 %{to_user}님, subject: '[OpenStreetMap] %{user}님이 당신을 친구로 추가했습니다' had_added_you: '%{user}님이 당신을 OpenStreetMap 친구로 추가했습니다.' see_their_profile: '%{userurl}에서 그들의 프로필을 ë³¼ 수 있습니다.' + see_their_profile_html: '%{userurl}에서 그들의 프로필을 ë³¼ 수 있습니다.' befriend_them: 또한 %{befriendurl}에서 친구로 추가할 수 있습니다. gpx_failure: + hi: 안녕하세요 %{to_user}님, failed_to_import: '가져오기에 실패했습니다. 오류는 다음과 같습니다:' subject: '[OpenStreetMap] GPX 가져오기 실패' gpx_success: + hi: 안녕하세요 %{to_user}님, loaded_successfully: 가능한 %{possible_points} 점 중 %{trace_points} 점을 성공적으로 불러왔습니다. subject: '[OpenStreetMap] GPX 가져오기 성공' signup_confirm: @@ -1265,21 +1351,11 @@ ko: welcome: 계정을 확인하고 나서, 시작하는 데 몇 가지 추가 정보를 제공합니다. email_confirm: subject: '[OpenStreetMap] 이메일 주소 확인' - email_confirm_plain: greeting: 안녕하세요, hopefully_you: 누군가가 아마 자신이 %{server_url} 에 %{new_address} (으)로 이메일 주소를 바꾸고 싶습니다. click_the_link: 만약 당신이라면 바뀐 내용을 확인하기 위해 아래의 링크를 클릭하세요. - email_confirm_html: - greeting: 안녕하세요, - hopefully_you: 누군가가 아마 자신이 %{server_url} 에 %{new_address} (으)로 이메일 주소를 바꾸고 싶습니다. - click_the_link: 만약 당신이라면 바뀐 내용을 확인하기 위해 아래 링크를 클릭하세요. lost_password: subject: '[OpenStreetMap] 비밀번호 재설정 요청' - lost_password_plain: - greeting: 안녕하세요, - hopefully_you: 누군가가 아마 자신이 이 이메일 계정의 openstreetmap.org 계정에서 재설정할 비밀번호를 요청했습니다. - click_the_link: 만약 당신이라면 비밀번호를 재설정하기 위해 아래 링크를 클릭하세요. - lost_password_html: greeting: 안녕하세요, hopefully_you: 누군가가 아마 자신이 이 이메일 계정의 openstreetmap.org 계정에서 재설정할 비밀번호를 요청했습니다. click_the_link: 만약 당신이라면 비밀번호를 재설정하기 위해 아래 링크를 클릭하세요. @@ -1305,6 +1381,7 @@ ko: commented_note: '%{commenter}님이 내가 덧글을 남긴 지도 참고를 다시 활성했습니다. 참고는 %{place} 근처에 있습니다.' details: 참고에 대한 자세한 사항은 %{url}에서 찾을 수 있습니다. + details_html: 참고에 대한 자세한 사항은 %{url}에서 ë³¼ 수 있습니다. changeset_comment_notification: hi: 안녕하세요 %{to_user}님, greeting: 안녕하세요, @@ -1390,6 +1467,25 @@ ko: as_unread: 메시지를 읽지 않은 것으로 표시 destroy: destroyed: 메시지가 삭제됨 + shared: + markdown_help: + title_html: kramdown으로 + 구문 분석됨 + headings: 문단 제목 + heading: 문단 제목 + subheading: 하위 문단 제목 + unordered: 순서 없는 목록 + ordered: 순서 있는 목록 + first: 첫 번째 항목 + second: 두 번째 항목 + link: 링크 + text: 텍스트 + image: 이미지 + alt: 대체 텍스트 + url: URL + richtext_field: + edit: 편집 + preview: 미리 보기 site: about: next: 다음 @@ -1556,14 +1652,6 @@ ko: 공개로 편집을 설정할 수 있습니다. user_page_link: 사용자 문서 anon_edits_link_text: 왜 이러한지 알아보세요. - flash_player_required_html: OpenStreetMap 플래시 편집기인 Potlatch를 사용하려면 플래시 플레이어가 - 필요합니다. Adobe.com에서 플래시 플레이어를 다운로드할 - 수 있습니다. 몇 가지 다른 설정 - 또한 OpenStreetMap 편집을 위해 사용할 수 있습니다. - potlatch_unsaved_changes: 바뀐 내용을 저장하지 않았습니다. (Potlatch에 저장하려면 라이브 모드에서 편집하는 - 경우 현재 길이나 점의 선택을 해제하시고, 저장 버튼이 있다면 저장을 클릭해야 합니다.) - potlatch2_not_configured: Potlatch 2가 설정되지 않았습니다 - 자세한 정보는 https://wiki.openstreetmap.org/wiki/The_Rails_Port - potlatch2_unsaved_changes: 바뀐 내용을 저장하지 않았습니다. (Potlatch 2에서 저장하려면 저장을 클릭해야 합니다.) id_not_configured: iD가 설정되지 않았습니다 no_iframe_support: 브라우저가 이 기능에 필요한 HTML iframe을 지원하지 않습니다. export: diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml index 0ac4eb3f0..936f51c45 100644 --- a/config/locales/ku-Latn.yml +++ b/config/locales/ku-Latn.yml @@ -25,23 +25,23 @@ ku-Latn: diary_comment: create: Tomar bike diary_entry: - create: Biweșîne + create: Biweşîne update: Rojane bike issue_comment: - create: Şîroveyekê tevlî bike + create: Şîroveyekê lê zêde bike message: create: Bişîne client_application: - create: Qeyd bibe + create: Hesab çêke update: Rojane bike redaction: - create: Redaksiyonê çêbike + create: Redaksiyonê çêke update: Redaksiyonê qeyd bike trace: create: Bar bike - update: Guherandinan qeyd bike + update: Guhartinan qeyd bike user_block: - create: Astengiyê çêbike + create: Astengiyê çêke update: Astengê nû bike activerecord: errors: @@ -79,7 +79,7 @@ ku-Latn: tracepoint: Nuqteya Taqîbkirinê tracetag: Nîşana Şopandinê user: Bikarhêner - user_preference: Tercîhên bikarhêner + user_preference: Tercîha bikarhêner user_token: Sembola bikarhênerê way: Rê way_node: Girêdana rê @@ -127,8 +127,8 @@ ku-Latn: recipient: Wergir report: category: Ji bo rapora xwe sedemekî bibijêre - details: Ji kerema xwe di derbarê pirsgirêkê de zêdetir zanyarî bide (pêwist - e). + details: Ji kerema xwe di derbarê pirsgirêkê de zêdetir zanyarî bide (hewce + ye). user: email: E-name active: Çalak @@ -181,18 +181,12 @@ ku-Latn: other: berî %{count} salan editor: default: Standard (vêga %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (sererastkirina ji ser geroka webê) id: name: iD description: iD (sererastkirina ji ser geroka webê) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (sererastkirina ji ser geroka webê) remote: name: Ji Dûr Ve Îdarekirin - description: Ji dûr ve kontrol (JOSM yan jî Merkaartor) + description: Ji dûr ve kontrol (JOSM, Potlatch, Merkaartor) auth: providers: none: Tune @@ -249,7 +243,7 @@ ku-Latn: part_of_ways: one: 1 rê other: '%{count} rê' - download_xml: XML'ê daxîne + download_xml: XMLê daxe view_history: Dîrokê Bibîne view_details: Detayan Bibîne location: 'Cih:' @@ -425,13 +419,8 @@ ku-Latn: new: title: Nivîsa nû yê rojane form: - subject: 'Mijar:' - body: Nivîsː - language: 'Ziman:' - location: 'Cih:' - latitude: 'Hêlîpan:' - longitude: 'Hêlîlar:' - use_map_link: nexşeyê bikarbîne + location: Cih + use_map_link: Nexşeyê bi kar bîne index: title: Rojnivîskên bikarhêneran title_friends: Rojnivîskên hevalan @@ -461,14 +450,15 @@ ku-Latn: xwe herfan rast binivîse, an jî belkî lînkê ku te tikandiye nerast be. diary_entry: posted_by_html: Ji alî %{link_user} ve di %{created} de bi %{language_link} - hatiye nivîsîn + hatiye nivîsîn. + updated_at_html: Cara dawiyê di %{updated} de hatiye nûkirin. comment_link: Vê nivîsê şîrove bike reply_link: Peyamekî bişînê nivîserê comment_count: zero: Bêşîrove one: '%{count} şîrove' other: '%{count} şîrove' - edit_link: Vê nivîsê biguherîne + edit_link: Vê nivîsê biguhêre hide_link: Vê nivîsê biveşêre unhide_link: Veşartina vê nivîsê rake confirm: Tesdîq bike @@ -482,7 +472,7 @@ ku-Latn: location: location: 'Cih:' view: Bibîne - edit: Biguherîne + edit: Biguhêre feed: user: title: Nivîsên rojane yên %{user} a OpenStreetMapê @@ -505,13 +495,13 @@ ku-Latn: heading: Bila %{user} li hevalên te were zêdekirin? button: Bibe heval success: '%{name} niha hevalê te yeǃ' - failed: Bibore, %{name} li hevalên te nehate zêdekirin. + failed: Bibore, %{name} li hevalên te nikarîbû were zêdekirin. already_a_friend: Tu bi %{name} re jixwe heval î. remove_friend: heading: Bila %{user} ji hevaltiyê were derxistin? button: Ji hevaltiyê derxe success: '%{name} ji hevalên te hate derxistin.' - not_a_friend: '%{name} ne hevalê te ye.' + not_a_friend: '%{name} ne hevalekî/eke te ye.' geocoder: search: title: @@ -1047,6 +1037,9 @@ ku-Latn: newspaper: Ofîsa Rojnameyê ngo: Ofîsa Komeleyên Civata Sivîl notary: Noter + religion: Ofîsa Karûbarên Dînî + research: Ofîsa Lêkolînê + tax_advisor: Şewirmendê Bacê telecommunication: Ofîsa telekomunîkasyonê travel_agent: Acenteya seyahetê "yes": Ofîs @@ -1066,6 +1059,7 @@ ku-Latn: locality: Cih municipality: Şaredarî neighbourhood: Mehel / herêm + plot: Erd postcode: Koda posteyê quarter: Herêmek bajarê region: Herêm @@ -1100,12 +1094,19 @@ ku-Latn: switch: Meqesa rêhesinê tram: Rêya tramwayê tram_stop: Rawestgeha tramwayê + yard: Hewşa Rêhesinê shop: + agrarian: Dikana Amûrên Çandiniyê alcohol: Dikana Araqan antiques: Antîkafiroş + appliance: Dikana Makîneyên Malê art: Dikanê tiştên hunerî + baby_goods: Berhemên Pitikan + bag: Dikana Çenteyan bakery: Firrin + bathroom_furnishing: Ekîpmanên Serşokê beauty: Salona Bedewiyê + bed: Berhemên Nivînê beverages: Dikana tiştên vexwarinê bicycle: Bisiklêtfiroş bookmaker: Girew / Miçilge @@ -1117,7 +1118,9 @@ ku-Latn: car_repair: Tamîrkera erebeyan carpet: Dikanê xaliyan charity: Dikana malên xêrkariyê + cheese: Dikana Penîran chemist: Dermanfiroş + chocolate: Çoklata clothes: Dikana cilan coffee: Firoşgeha Qehweyê computer: Dikana Kompûteran @@ -1125,6 +1128,9 @@ ku-Latn: convenience: Beqal copyshop: Dikana kopîkirinê cosmetics: Dikana kozmetîkan + craft: Dikana Malzemeyên Destkariyan + curtain: Dikana Perdeyan + dairy: Dikana Berhemên Şîrî deli: Şarkuterî department_store: Firoşgeha mezin discount: Dikana tiştûmiştên di erzaniyê de @@ -1134,45 +1140,64 @@ ku-Latn: electronics: Dikana elektronîkan erotic: Dikana Erotîkî estate_agent: Emlaqfiroş + fabric: Dikana Qumaşan farm: Dikana mehsûlên çandiniyê fashion: Dikana Cil û Bergên Mode + fishing: Dikana Malzemeyên Masîgiriyê florist: Kulîlkfiroş food: Dikana Xwarinê + frame: Dikana Çarçoveyan funeral_directors: Rêvebirên merasima cenazeyê furniture: Mobîlya garden_centre: Navenda Tişt û miştên Baxçeyan + gas: Dikana Gazê general: Dikan / Mexeze gift: Dikana Tişt û miştên diyariyê greengrocer: Dikana Şînahiyan grocery: Beqal hairdresser: Kuafor hardware: Xurdefiroş + health_food: Dikana Xwarinên Tenduristiyê + hearing_aids: Cîhazên Bihîstinê + herbalist: Dikana Giyayên Şîfadar hifi: Dikana Cîhazên Hi-Fi houseware: Dikana eşyayên xaniyan + ice_cream: Dikana Berfeşîrê interior_decoration: Dekorasyona hundirê malê jewelry: Gewherfiroş kiosk: Kîosk (Dikanên biçûk) kitchen: Dikana malzemeyên mitbaxê laundry: Cihê Cilşûştinê + locksmith: Kilîdveker lottery: Piyango mall: Mexezeyên Mezin massage: Masaj + medical_supply: Dikana Malzemeyên Tibî mobile_phone: Dikana Telefonên Mobîl + money_lender: Bideyndêr motorcycle: Dikana motorsîklêtan + motorcycle_repair: Dikana Tamîrkirina Motorsîkletê music: Dikanên muzîkê + musical_instrument: Enstrumanên Muzîkê newsagent: Bayiya Rojnameyan + nutrition_supplements: Temamkerên Xwarinan optician: Berçavkvan organic: Dikana xwarinên organîk outdoor: Dikana ekîpmanê yê sporên servekirî paint: Dikana boyaxan + pastry: Dikana Pasteyan pawnbroker: Rehîngir / selefxur + perfumery: Parfûmfiroş pet: Dikana firotana heywanan + pet_grooming: Xwedîkirina Heywanên Kedî photo: Dikana fotografê seafood: Berhemên behrê second_hand: Dikana destê diduyan + sewing: Dikana Dirûnê shoes: Dikana solan sports: Dikana malzemeyên werzişê stationery: Qirtasiye + storage_rental: Kirêkirina Depoyan supermarket: Supermarket tailor: Cildirû tattoo: Dikana Deqçêkirinê @@ -1196,6 +1221,7 @@ ku-Latn: attraction: Cihên balkêş bed_and_breakfast: Pansiyona tevî 'taştê û nivîn' cabin: Xanîk + camp_pitch: Qada Kampê camp_site: Cihê kampê caravan_site: Cihê karavanê chalet: Xaniya zozanê @@ -1236,12 +1262,15 @@ ku-Latn: "yes": Robar admin_levels: level2: Hidûda welatê + level3: Sînora Herêmê level4: Sînora parêzgehê level5: Sînora herêmê level6: Hidûda navçeyê + level7: Sînora Şaredariyê level8: Hidûda bajarê level9: Sînora gundê level10: Sînora taxê + level11: Sînora Taxê types: cities: Bajarên mezin towns: Bajar @@ -1409,14 +1438,23 @@ ku-Latn: hi: Silav %{to_user}, header: '%{from_user} nivîsa rojane yê OpenStreetMapê a bi mijara %{subject} şirove kir:' + header_html: '%{from_user} nivîsa rojane yê OpenStreetMapê a bi mijara %{subject} + şirove kir:' footer: Herwiha ji ser rûpela %{readurl} jî dikarî şiroveyê bixwînî û ji ser %{commenturl} dikarî şirove bikî an jî ji ser %{replyurl} peyamekî bişîne nivîserê. + footer_html: Herwiha ji ser rûpela %{readurl} jî dikarî şiroveyê bixwînî û ji + ser %{commenturl} dikarî şirove bikî an jî ji ser %{replyurl} peyamekî bişîne + nivîserê. message_notification: - subject_header: '[OpenStreetMap] %{subject}' + subject: '[OpenStreetMap] %{message_title}' hi: Merheba %{to_user}, header: '%{from_user} ji te re bi rêya OpenStreetMapê peyamek bi mijara %{subject} şand:' + header_html: '%{from_user} ji te re bi rêya OpenStreetMapê peyamek bi mijara + %{subject} şand:' + footer: Tu dikarî peyamê li ser %{readurl} jî bixwînî û li ser %{replyurl} jî + dikarî bersiv bidî ê go ji te re şand. footer_html: Tu dikarî peyamê li ser %{readurl} jî bixwînî û li ser %{replyurl} jî dikarî bersiv bidî ê go ji te re şand. friendship_notification: @@ -1425,10 +1463,20 @@ ku-Latn: had_added_you: Bikarhêner %{user} li ser OpenStreetMapê te wek heval lê zêde kir. see_their_profile: Ji ser %{userurl} dikarî binêrî profîlê wan. + see_their_profile_html: Ji ser %{userurl} dikarî binêrî profîlê wan. befriend_them: Herwiha ji ser %{befriendurl} wan dikarî wek heval lê zêde bikî. + befriend_them_html: Herwiha ji ser %{befriendurl} wan dikarî wek heval lê zêde + bikî. + gpx_description: + description_with_tags_html: 'Dosyeya te ya GPXê %{trace_name} tevî danasîna + %{trace_description} û van etîketan wisa dixuye: %{tags}' + description_with_no_tags_html: Wisa dixuye ku dosyeya te ya GPxê %{trace_name} + tevî danasîna %{trace_description} ye û bêetîket e gpx_failure: hi: Merheba %{to_user}, failed_to_import: 'anîna dosyeyê bi ser neket. Çewtî ev e:' + more_info_html: Agahiyên zêdetir ên derbarê çewtiyên împortkirinê û rêlibergirtina + wê ji %{url} dikarî peyda bikî. import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures subject: '[OpenStreetMap] Anîna GPXê bi ser neket' gpx_success: @@ -1451,27 +1499,13 @@ ku-Latn: pê bikî hinek agahiyên din jî bidin. email_confirm: subject: '[OpenStreetMap] E-peyama xwe tesdîq bike' - email_confirm_plain: greeting: Silav, hopefully_you: Yekî (em hêvî dikin ku ew tu bî) dixwaze adrêsa e-peyama te ya li %{server_url}, wek %{new_address} biguherîne. click_the_link: Eger, ev ê te be, xêra xwe ji bo tesdîqkirina guhertinê bitikîne ser lînka li jêr. - email_confirm_html: - greeting: Silav, - hopefully_you: Yekî (em hêvî dikin ku ew tu bî) dixwaze adrêsa e-peyama te ya - li %{server_url} qeydkîrî ye, wek %{new_address} biguherîne. - click_the_link: Eger, ew tu bî, xêra xwe ji bo tesdîqkirina guhertinê bitikîne - ser lînka li jêr. lost_password: subject: '[OpenStreetMap] Daxwaza nûkirina şîfreyê' - lost_password_plain: - greeting: Silav, - hopefully_you: Yekî (dibe be ku tu bî) xwest ku şîfreya vê adrêsa e-peyamê ya - hesaba openstreetmap.orgê were nûkirin. - click_the_link: Eger ev tu bî, xêra xwe ji bo nûkirina şîfreyê bitikîne ser - lînla li jêr. - lost_password_html: greeting: Silav, hopefully_you: Yekî (dibe be ku tu bî) xwest ku şîfreya vê adrêsa e-peyamê ya hesaba openstreetmap.orgê were nûkirin. @@ -1486,16 +1520,24 @@ ku-Latn: dibî şiroveyek nivîsand' your_note: '%{commenter} li ser notekî te yê nexşeyê a nêzîkî %{place} şiroveyek berda.' + your_note_html: '%{commenter} li ser notekî te yê nexşeyê a nêzîkî %{place} + şiroveyek berda.' commented_note: '%{commenter} li ser notekî te yê nexşeyê a ku te şiroveyek berdabû şiroveyek nivîsand. Ev not nêzîkî %{place} (y)e.' + commented_note_html: '%{commenter} li ser notekî te yê nexşeyê a ku te şiroveyek + berdabû şiroveyek nivîsand. Ev not nêzîkî %{place} (y)e.' closed: subject_own: '[OpenStreetMap] %{commenter} yek ji notên te çareser kir' subject_other: '[OpenStreetMap] %{commenter} notek ku tu pê eleqedar dibî çareser kir' your_note: '%{commenter} yek ji notên te yên nexşeyê a nêzîkî %{place} çareser kir.' + your_note_html: '%{commenter} yek ji notên te yên nexşeyê a nêzîkî %{place} + çareser kir.' commented_note: '%{commenter} notekî nexşeyê yê ku te şiroveyek berdabû çareser kir. Ev not nêzîkî %{place} (y)e.' + commented_note_html: '%{commenter} notekî nexşeyê yê ku te şiroveyek berdabû + çareser kir. Ev not nêzîkî %{place} (y)e.' reopened: subject_own: '[OpenStreetMap] %{commenter} yek ji notên te ji nû ve aktîv kir' @@ -1503,9 +1545,14 @@ ku-Latn: ji nû ve aktîv kir' your_note: '%{commenter} yek ji notên te yên nexşeyê a nêzîkî %{place} ji nû ve da aktîvkirin.' + your_note_html: '%{commenter} yek ji notên te yên nexşeyê a nêzîkî %{place} + ji nû ve da aktîvkirin.' commented_note: '%{commenter} notekî nexşeyê yê ku te şiroveyek berdabû jinûve da aktîvkirin. Ev not nêzîkî %{place} (y)e.' + commented_note_html: '%{commenter} notekî nexşeyê yê ku te şiroveyek berdabû + jinûve da aktîvkirin. Ev not nêzîkî %{place} (y)e.' details: Dêtayên zêdetir yên derbarê notê de hûn dikarin ji %{url} bibînin. + details_html: Dêtayên zêdetir yên derbarê notê de hûn dikarin ji %{url} bibînin. changeset_comment_notification: hi: Merheba %{to_user}, greeting: Merheba, @@ -1516,15 +1563,25 @@ ku-Latn: pê eleqedar dibî şirove kir' your_changeset: '%{commenter} li ser desteyekî te yê guherandinê şîroveyekê berda di %{time} de' + your_changeset_html: '%{commenter} li ser desteyekî te yê guherandinê şîroveyekê + berda di %{time} de' commented_changeset: '%{commenter} di %{time} de li ser desteya guhertinê yê ku tu dişopînî şiroveyek berda, ji aliyê %{changeset_author} ve hatiye çêkirin' + commented_changeset_html: '%{commenter} di %{time} de li ser desteya guhertinê + yê ku tu dişopînî şiroveyek berda, ji aliyê %{changeset_author} ve hatiye + çêkirin' partial_changeset_with_comment: tevî şiroveya '%{changeset_comment}' + partial_changeset_with_comment_html: tevî şiroveya '%{changeset_comment}' partial_changeset_without_comment: bêyî şirove details: Dêtayên zêdetir yên derbarê desteya guherandinê de hûn dikarin ji %{url} bibînin. + details_html: Dêtayên zêdetir yên derbarê desteya guherandinê de hûn dikarin + ji %{url} bibînin. unsubscribe: Ji bo ku ji abonetiya rojanekirinên vê desteya guherandinê derbikevî, here %{url} û bitikîne ser "Abonetiyê betal bike". + unsubscribe_html: Ji bo ku ji abonetiya rojanekirinên vê desteya guherandinê + derbikevî, here %{url} û bitikîne ser "Abonetiyê betal bike". messages: inbox: title: Qutiya hatiyan @@ -1600,6 +1657,26 @@ ku-Latn: as_unread: Peyam wek nexwendî hate nîşankirin destroy: destroyed: Payam hate jêbirin + shared: + markdown_help: + title_html: |- + Bi kramdown + hate analîzkirin + headings: Sernivîs + heading: Sernivîs + subheading: Sernivîsa binî + unordered: Lîsta nerêzkirî + ordered: Lîsta rêzkirî + first: Hêmana yekem + second: Hêmana duyem + link: Lînk + text: Nivîs + image: Wêne + alt: Nivîsa alternatîv + url: URL + richtext_field: + edit: Biguherîne + preview: Pêşdîtin site: about: next: Pêşve @@ -1783,19 +1860,6 @@ ku-Latn: herkesê re vekirî eyar bikî. user_page_link: rûpela bikarhêner anon_edits_link_text: Hîn bibe ku ev rewş çima wisa bûye. - flash_player_required_html: Ji bo ku edîtora OpenStreetMap Flashê yê bi navê - Potlatch bi kar bînî, ihtîyaca te bi Flash playerê heye. Tu dikarî Flash - Playerê ji ser Adobe.com'ê daxînî. Ji bo sererastkirina OpenStreetMapê - gelek vebijêrkên din - jî hene. - potlatch_unsaved_changes: Guherandinên te yên neqeydkirî hene. (Ji bo di Potlatchê - de qeyd bikî, divê gava ku guherandinê xwe di moda zindî de dikî, rê an jî - nuqteya ku vêga heyî bibijêrî, û heke bişkokek qeydkirinê hebe bitikînî ser - qeyd bike'yê.) - potlatch2_not_configured: Potlach 2 nehate vesazkirin - ji bo zêdetir agahiyan - xêra xwe binêre https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 - potlatch2_unsaved_changes: Guherandinên te yên neqeydkirî hene. (Ji bo ku di - Potlatch 2'ê de qeyd bikî bitikîne ser qeyd bike'yê.) id_not_configured: iD nehatiye mîhengkirin no_iframe_support: Geroka te piştgiriyê nade iframe'yên HTML ku ji bo nişandana vê taybetmendiyê lazim e. @@ -1911,6 +1975,15 @@ ku-Latn: url: https://wiki.openstreetmap.org/ title: Wîkiya OpenStreetMapê description: Ji bo belgeyên OpenStreetMapyê yên bi berfirehî binêrin wîkiyê. + potlatch: + removed: Edîtora te ya OpenStreetMapê ya standard wek Potlatch hate bijartin. + Ji ber ku Adobe Flash Player vekişiya, Potlatch êdî di gerokeke webê de ne + berdest e. + desktop_html: Tu hê jî dikarî Potlatchê bi kar bînî bi daxistina + sepana sermaseyê yên ji Mac û Windowsê. + id_html: Wek alternatîv, tu dikarî edîtora xwe ya standard bikî iD ku ew di + geroka te ya webê de wekî şixula Potlatchê dixebite. Ji + vir mîhengên xwe yên bikarhêneriyê biguherîne. sidebar: search_results: Encamên lêgerînê close: Bigire diff --git a/config/locales/lb.yml b/config/locales/lb.yml index 93b305e3b..ce6065fc5 100644 --- a/config/locales/lb.yml +++ b/config/locales/lb.yml @@ -93,18 +93,47 @@ lb: tagstring: Mat Komma getrennt datetime: distance_in_words_ago: + about_x_hours: + one: virun ongeféier 1 Stonn + other: virun ongeféier %{count} Stonnen + about_x_months: + one: virun ongeféier 1 Mount + other: virun ongeféier %{count} Méint + about_x_years: + one: virun ongeféier 1 Joer + other: virun ongeféier %{count} Joer + almost_x_years: + one: viru bal 1 Joer + other: viru bal %{count} Joer half_a_minute: virun enger hallwer Minutt + less_than_x_seconds: + one: viru manner wéi 1 Sekonn + other: viru manner wéi %{count} Sekonnen + less_than_x_minutes: + one: viru manner wéi 1 Minutt + other: viru manner wéi %{count} Minutten + over_x_years: + one: viru méi wéi 1 Joer + other: viru méi wéi %{count} Joer x_seconds: one: virun 1 virun enger Sekonn other: virun viru(n) %{count} Sekonnen + x_minutes: + one: virun 1 Minutt + other: viru(n) %{count} Minutten + x_days: + one: virun 1 Dag + other: viru(n) %{count} Deeg + x_months: + one: virun 1 Mount + other: viru(n) %{count} Méint + x_years: + one: virun 1 Joer + other: viru(n) %{count} Joer editor: default: Standard (elo %{name}) - potlatch: - name: Potlatch 1 id: name: iD - potlatch2: - name: Potlatch 2 auth: providers: none: Keng @@ -116,6 +145,11 @@ lb: wikipedia: Wikipedia api: notes: + comment: + closed_at_html: Geléist %{when} + closed_at_by_html: Geléist %{when} vum %{user} + reopened_at_html: Reaktivéiert %{when} + reopened_at_by_html: Reaktivéiert %{when} vum %{user} rss: title: OpenStreetMap Notizen entry: @@ -253,11 +287,7 @@ lb: commented_at_by_html: '%{when} vum %{user} aktualiséiert' diary_entries: form: - subject: 'Sujet:' - language: 'Sprooch:' - location: 'Plaz:' - latitude: 'Breedegrad:' - longitude: 'Längegrad:' + location: Plaz use_map_link: Kaart benotzen index: title: Blogge vun de Benotzer @@ -267,7 +297,8 @@ lb: login_to_leave_a_comment_html: '%{login_link} fir eng Bemierkung ze schreiwen' login: Aloggen diary_entry: - posted_by_html: Vum %{link_user} matgedeelt de(n) %{created} op %{language_link} + posted_by_html: Vum %{link_user} matgedeelt de(n) %{created} op %{language_link}. + updated_at_html: Lescht Aktualiséierung de(n) %{updated} reply_link: Dem Auteur e Message schécken comment_count: one: '%{count} Bemierkung' @@ -774,6 +805,7 @@ lb: diary_comment_notification: hi: Salut %{to_user}, message_notification: + subject: '[OpenStreetMap] %{message_title}' hi: Salut %{to_user}, footer_html: Dir kënnt de Message och op %{readurl} liesen an Dir kënnt op %{replyurl} äntwerten @@ -791,24 +823,14 @@ lb: greeting: Bonjour ! email_confirm: subject: '[OpenStreetMap] Confirméiert Är E-Mailadress' - email_confirm_plain: - greeting: Salut, - click_the_link: Wann Dir dat sidd, da klickt op de Link hei drënner fir d'Ännerung - ze confirméieren. - email_confirm_html: greeting: Salut, click_the_link: Wann Dir dat sidd, da klickt op de Link hei drënner fir d'Ännerung ze confirméieren. lost_password: subject: '[OpenStreetMap] Ufro fir d''Passwuert zréckzesetzen' - lost_password_plain: greeting: Salut, click_the_link: Wann Dir dat sidd da klickt wgl. op de Link hei drënner fir Äert Passwuert zréckzesetzen. - lost_password_html: - greeting: Salut, - click_the_link: Wann Dir dat sidd da klickt wgl. op de Link hei drënner fir - Ärt Passwuert zréckzesetzen. note_comment_notification: anonymous: En anonyme Benotzer greeting: Salut, @@ -861,6 +883,22 @@ lb: as_unread: Message als net geliest markéiert destroy: destroyed: Message geläscht + shared: + markdown_help: + headings: Iwwerschrëften + heading: Iwwerschrëft + subheading: Ënneriwwerschrëft + unordered: Net-nummeréiert Lëscht + ordered: Nummeréiert Lëscht + first: Éischt Element + second: Zweet Element + link: Link + text: Text + image: Bild + alt: Alternativen Text + url: URL + richtext_field: + edit: Änneren site: about: next: Weider diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 88e653be0..2127701b9 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -184,15 +184,9 @@ lt: other: prieÅ¡ %{count} metus editor: default: Numatytasis (Å¡iuo metu %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (rengyklė narÅ¡yklėje) id: name: iD description: iD (rengyklė narÅ¡yklėje) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (rengyklė narÅ¡yklėje) remote: name: nuotoliniu valdymu description: nuotolinį valdymą (JOSM arba Merkaartor) @@ -397,13 +391,8 @@ lt: new: title: Naujas dienoraščio įraÅ¡as form: - subject: 'Tema:' - body: 'Tekstas:' - language: 'Kalba:' - location: 'Pozicija:' - latitude: 'Platuma:' - longitude: 'Ilguma:' - use_map_link: naudoti žemėlapį + location: Pozicija + use_map_link: Naudoti žemėlapį index: title: Naudotojo dienoraščiai title_friends: Draugų dienoraščiai @@ -432,7 +421,7 @@ lt: body: AtsipraÅ¡ome, čia nėra jokio dienoraščio įraÅ¡o ar komentaro su Å¡iuo id %{id}. Pasitikrinkite raÅ¡ybą, arba nuoroda kurią jÅ«s pasirinkite yra klaidinga. diary_entry: - posted_by_html: Parašė %{link_user}, laikas %{created}, kalba %{language_link} + posted_by_html: Parašė %{link_user}, laikas %{created}, kalba %{language_link}. comment_link: Komentuoti šį įrašą reply_link: Siųsti žinutę autoriui comment_count: @@ -1219,6 +1208,8 @@ lt: message_notification: hi: Sveiki, %{to_user}, header: '%{from_user} atsiuntė jums praneÅ¡imą per OpenStreetMap su tema „%{subject}“:' + header_html: '%{from_user} atsiuntė jums praneÅ¡imą naudojant OpenStreetMap su + tema „%{subject}“:' footer_html: PraneÅ¡imą galite skaityti čia %{readurl}, o nusiųsti žinutę autoriui galite čia %{replyurl} friendship_notification: @@ -1246,30 +1237,18 @@ lt: padėsiančios jums pradėti. email_confirm: subject: '[OpenStreetMap] Patvirtinkite savo e-paÅ¡to adresą' - email_confirm_plain: greeting: Sveiki, hopefully_you: Kažkas (tikimės, kad tai jÅ«s) nori pakeisti savo elektroninio paÅ¡to adresą iÅ¡ %{server_url} į %{new_address}. click_the_link: Jei tai jÅ«s, spauskite žemiau pateikiamą nuorodą, kad patvirtintumėte pakeitimą. - email_confirm_html: - greeting: Sveiki, - hopefully_you: Kažkas (tikimės, kad tai jÅ«s) nori pakeisti savo elektroninio - paÅ¡to adresą iÅ¡ %{server_url} į %{new_address}. - click_the_link: Jei tai jÅ«s, paspauskite žemiau esančią nuorodą pakeitimui patvirtinti. lost_password: subject: '[OpenStreetMap] Slaptažodžio atstatymo praÅ¡ymas' - lost_password_plain: greeting: Sveiki, hopefully_you: Kažkas (tikriausiai jÅ«s) paprašė anuliuoti slaptažodį, susijusį su Å¡io paÅ¡to adreso openstreetmap.org paskyra. click_the_link: Jei tai jÅ«s, paspauskite žemiau esančią nuorodą, kad iÅ¡ naujo nustatytumėte slaptažodį. - lost_password_html: - greeting: Sveiki, - hopefully_you: Kažkas (tikriausiai jÅ«s) paprašė anuliuoti slaptažodį, susijusį - su Å¡io paÅ¡to adreso openstreetmap.org paskyra. - click_the_link: Jei tai jÅ«s, spauskite žemiau pateikiamą nuorodą. note_comment_notification: anonymous: Anoniminis naudotojas greeting: Sveiki, @@ -1294,6 +1273,7 @@ lt: commented_note: '%{commenter} aktyvavo žemėlapio pastabą, kurį jÅ«s pakomentavote. Pastaba yra netoli %{place}.' details: Daugiau informacijos apie pastabą galima rasti %{url}. + details_html: Daugiau informacijos apie pastabą galima rasti %{url}. changeset_comment_notification: hi: Sveiki, %{to_user}, greeting: Labas, @@ -1384,6 +1364,10 @@ lt: as_unread: PraneÅ¡imas pažymėtas kaip neskaitytas destroy: destroyed: PraneÅ¡imas iÅ¡trintas + shared: + markdown_help: + link: Nuoroda + text: Tekstas site: about: next: Kitas @@ -1561,18 +1545,6 @@ lt: JÅ«s galite nustatyti keitimus, kaip vieÅ¡us, iÅ¡ savo %{user_page}. user_page_link: naudotojo puslapis anon_edits_link_text: Sužinokite, kodėl taip yra. - flash_player_required_html: Norint redaguoti su Potlatch, OpenStreetMap Flash - rengykle, jums reikia Flash player. JÅ«s galite parsisiųsti - Flash Player iÅ¡ Adobe.com. Taip - pat yra daugybė kitų bÅ«dų, kuriais galėsite prisidėti prie OpenStreetMap - žemėlapio redagavimo. - potlatch_unsaved_changes: Turite neįraÅ¡ytų keitimų. Norint įraÅ¡yti keitimą Potlatch'e, - jÅ«s turite nuimti pažymėtus taÅ¡kus ir kelius jei redaguojate gyvai (live mode) - ar tiesiog tiesiog paspauskite mygtuką 'įraÅ¡yti'. - potlatch2_not_configured: Potlatch 2 nesukonfigÅ«ruotas - daugiau informacijos - rasite https://wiki.openstreetmap.org/wiki/The_Rails_Port - potlatch2_unsaved_changes: Yra neįraÅ¡ytų pakeitimų. (Norėdami įraÅ¡yti Potlatch - 2, turėtumėte spustelėti įraÅ¡yti.) id_not_configured: iD nesukonfigÅ«ruotas no_iframe_support: JÅ«sų narÅ¡yklė nepalaiko HTML iframe'ų, o Å¡iai savybei jie bÅ«tini. diff --git a/config/locales/lv.yml b/config/locales/lv.yml index db8dffa4c..1d2b33632 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -129,15 +129,9 @@ lv: tagstring: atdalÄ«ts ar komatiem editor: default: Noklusējuma (paÅ¡laik %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (atvērt pārlÅ«kā) id: name: iD description: iD (pārlÅ«ka redaktors) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (atvērt pārlÅ«kā) remote: name: Attālinātā palaiÅ¡ana description: Attālinātā palaiÅ¡ana (JOSM vai Merkaartor) @@ -340,12 +334,7 @@ lv: new: title: Jauns dienasgrāmatas ieraksts form: - subject: 'Temats:' - body: 'Teksts:' - language: 'Valoda:' location: 'AtraÅ¡anās vieta:' - latitude: 'Platums:' - longitude: 'Garums:' use_map_link: izmantot karti index: title: Lietotāju dienasgrāmatas @@ -971,9 +960,11 @@ lv: "yes": Ūdensceļš admin_levels: level2: Valsts robeža + level3: ReÄ£iona robeža level4: Å tata robeža level5: Rajona robeža level6: Pagasta robeža + level7: PaÅ¡valdÄ«bas robeža level8: Pilsētas robeža level9: Ciema robeža level10: PriekÅ¡pilsētas robeža @@ -1078,32 +1069,18 @@ lv: lai tu varētu sākt kartēt. email_confirm: subject: '[OpenStreetMap] Apstipriniet savu e-pasta adresi' - email_confirm_plain: greeting: Sveicināti, hopefully_you: Kāds (cerams Tu) vēlas mainÄ«t savu e-pasta adresi %{server_url} uz %{new_address}. click_the_link: Ja tas esat jÅ«s, lÅ«dzu klikÅ¡Ä·iniet uz zemāk esošās saites lai apstiprinātu e-pasta adreses nomaiņu. - email_confirm_html: - greeting: Sveicināti, - hopefully_you: Kāds (cerams, ka jÅ«s) vēlas mainÄ«t savu e-pasta adresi %{server_url} - uz %{new_address}. - click_the_link: Ja tas esat jÅ«s, lÅ«dzu klikÅ¡Ä·iniet uz zemāk esošās saites lai - apstiprinātu e-pasta adreses nomaiņu. lost_password: subject: '[OpenStreetMap] Paroles atiestatÄ«Å¡anas pieprasÄ«jums' - lost_password_plain: greeting: Sveicināti, hopefully_you: Kāds (iespējams Tu) ir pieprasÄ«jis paroles atjaunoÅ¡anu ar Å¡o e-pasta adresi reÄ£istrētam openstreetmap.org lietotājam. click_the_link: Ja tas esat jÅ«s, lÅ«dzu klikÅ¡Ä·iniet uz zemāk esošās saites lai atiestatÄ«tu savu paroli. - lost_password_html: - greeting: Sveicināti, - hopefully_you: Kāds (iespējams, jÅ«s) ir vēlējies atiestatÄ«t paroli Å¡Ä«s e-pasta - adreses openstreetmap.org kontam. - click_the_link: Ja tas esat jÅ«s, lÅ«dzu klikÅ¡Ä·iniet uz zemāk esošās saites lai - atiestatÄ«tu savu paroli. note_comment_notification: anonymous: 'AnonÄ«ms lietotājs:' greeting: Sveiks, @@ -1395,17 +1372,6 @@ lv: Tu vari uzstādÄ«t savus labojumus kā publiskus no savas %{user_page}s. user_page_link: dalÄ«bnieka lapa anon_edits_link_text: Uzzini, kāpēc tā notiek. - flash_player_required_html: Jums nepiecieÅ¡ams Flash playeris lai izmantotu Potlatch - - OpenStreetMap Flash redaktoru. JÅ«s varat Lejupielādēt - Flash Player no Adobe.com. OpenStreetMap rediģēšanai ir pieejamas arÄ«vairākas citas iespējas - . - potlatch_unsaved_changes: Tev ir nesaglabātas izmaiņas. (Lai saglabātu iekÅ¡ - Potlatch, tev ir jānoņem atlase no esošā ceļa vai punkta, ja labojiet tieÅ¡raides - režīmā, vai spiediet saglabāt, ja Jums ir Saglabāt poga.) - potlatch2_not_configured: Potlatch 2 nav konfigurēts - lÅ«dzu apskati http://wiki.openstreetmap.org/wiki/The_Rails_Port - potlatch2_unsaved_changes: Tev ir nesaglabātas izmaiņas. (Lai saglabātu iekÅ¡ - Potlach 2, tev ir jāspiež saglabāt.) id_not_configured: iD nav konfigurēts no_iframe_support: Tavs pārlÅ«ks neatbalsta HTML rāmjus, kas ir nepiecieÅ¡ami Å¡ai iezÄ«mei. diff --git a/config/locales/mk.yml b/config/locales/mk.yml index 23ffb8a18..6b172fb1b 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -180,18 +180,12 @@ mk: with_name_html: '%{name} (%{id})' editor: default: По основно (моментално %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (уредник во прелистувач) id: name: iD description: iD (прелистувачки програм за уредување) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (уредник во прелистувач) remote: name: Далечинско управување - description: Далечинско управување (JOSM или Merkaartor) + description: Далечинско управување (JOSM, Potlatch, Merkaartor) auth: providers: none: Нема @@ -411,13 +405,8 @@ mk: new: title: Нова дневничка ставка form: - subject: 'Наслов:' - body: 'Содржина:' - language: 'Јазик:' - location: 'Местоположба:' - latitude: Г.Ш. - longitude: Г.Д. - use_map_link: на карта + location: Местоположба + use_map_link: На карта index: title: Дневници на корисници title_friends: Дневници на пријателите @@ -446,7 +435,8 @@ mk: body: Жалиме, но нема дневничка ставка или коментар со назнаката %{id}. Проверете дали сте ја напишале правилно, или да не сте стиснале на погрешна врска. diary_entry: - posted_by_html: Испратено од %{link_user} во %{created} на %{language_link} + posted_by_html: Објавено од %{link_user} во %{created} на %{language_link}. + updated_at_html: Последна поднова на %{updated}. comment_link: Коментирај на ставкава reply_link: Испрати порака на авторот comment_count: @@ -1433,12 +1423,20 @@ mk: hi: Здраво %{to_user}, header: '%{from_user} коментираше на дневничката ставка на OpenStreetMap со наслов %{subject}:' + header_html: '%{from_user} коментираше на дневничката ставка на OpenStreetMap + со наслов %{subject}:' footer: Можете и да го прочитате коментарот на %{readurl}, да коментирате на %{commenturl} или пак да му испратите порака на авторот на %{replyurl} + footer_html: Можете и да го прочитате коментарот на %{readurl}, да коментирате + на %{commenturl} или пак да му испратите порака на авторот на %{replyurl} message_notification: - subject_header: '[OpenStreetMap] — %{subject}' + subject: '[OpenStreetMap] %{message_title}' hi: Здраво %{to_user}, header: '%{from_user} ви испрати порака преку OpenStreetMap со насловот %{subject}:' + header_html: '%{from_user} ви испрати порака преку OpenStreetMap со насловот + %{subject}:' + footer: Можете и да ја прочитате пораката на %{readurl} и да му испратите порака + на авторот на %{replyurl} footer_html: Можете и да ја прочитате пораката на %{readurl} и да му испратите порака на авторот на %{replyurl} friendship_notification: @@ -1446,7 +1444,9 @@ mk: subject: '[OpenStreetMap] %{user} ве додаде како пријател' had_added_you: '%{user} ве додаде како пријател на OpenStreetMap.' see_their_profile: Можете да го погледате профилот на оваа личност на %{userurl}. + see_their_profile_html: Можете да го погледате профилот на оваа личност на %{userurl}. befriend_them: Можете личноста и да ја додадете како пријател на %{befriendurl}. + befriend_them_html: Можете личноста и да ја додадете како пријател на %{befriendurl}. gpx_description: description_with_tags_html: 'Вашата GPX-податотека %{trace_name} со описот %{trace_description} и следниве ознаки: %{tags}' @@ -1475,31 +1475,18 @@ mk: да почнете со уредување. email_confirm: subject: '[OpenStreetMap] Потврдете ја вашата е-поштенска адреса' - email_confirm_plain: greeting: Здраво, hopefully_you: Некој (се надеваме, Вие) сака да ја смени е-поштенската адреса на %{server_url} со новата адреса %{new_address}. click_the_link: Ако ова сте вие, стиснете на врската подолу за да ја потврдите измената. - email_confirm_html: - greeting: Здраво, - hopefully_you: Некој (се надеваме, Вие) сака да ја смени е-поштенската адреса - на %{server_url} со новата адреса %{new_address}. - click_the_link: Ако ова сте вие, стиснете подолу за да ја потврдите измената. lost_password: subject: '[OpenStreetMap] Барање за промена на лозинка' - lost_password_plain: greeting: Здраво, hopefully_you: Некој (можеби Вие) побарал да се промени лозинката на сметката на openstreetmap.org која ѝ припаѓа на оваа адреса. click_the_link: Ако ова сте вие, стиснете на врската подолу за да си ја смените лозинката. - lost_password_html: - greeting: Здраво, - hopefully_you: Некој (можеби Вие) побарал да се промени лозинката на сметката - на openstreetmap.org која ѝ припаѓа на оваа адреса. - click_the_link: Ако ова сте вие, тогаш стиснете на врската подолу за да си ја - промените лозинката. note_comment_notification: anonymous: Анонимен корисник greeting: Здраво, @@ -1509,22 +1496,35 @@ mk: интересира' your_note: '%{commenter} искоментира на една од вашите белешки на картите близу %{place}.' + your_note_html: '%{commenter} искоментира на една од вашите белешки на картите + близу %{place}.' commented_note: '%{commenter} искоментира на картографска белешка на која вие веќе коментиравте. Белешката се наоѓа кај %{place}.' + commented_note_html: '%{commenter} искоментира на картографска белешка на + која вие веќе коментиравте. Белешката се наоѓа кај %{place}.' closed: subject_own: '[OpenStreetMap] %{commenter} реши една од вашите белешки' subject_other: '[OpenStreetMap] %{commenter} реши белешка што ве интересира' your_note: '%{commenter} реши една од вашите белешки на картите близу %{place}.' + your_note_html: '%{commenter} реши една од вашите белешки на картите близу + %{place}.' commented_note: '%{commenter} реши картографска белешка на која вие веќе коментиравте. Белешката се наоѓа кај %{place}.' + commented_note_html: '%{commenter} реши картографска белешка на која вие веќе + коментиравте. Белешката се наоѓа кај %{place}.' reopened: subject_own: '[OpenStreetMap] %{commenter} преактивира една од вашите белешки' subject_other: '[OpenStreetMap] %{commenter} преактивира белешка што ве интересира' your_note: '[OpenStreetMap] %{commenter} преактивира една од вашите белешки на каритте близу %{place}.' + your_note_html: '[OpenStreetMap] %{commenter} преактивира една од вашите белешки + на каритте близу %{place}.' commented_note: '%{commenter} реши картографска белешка на која имате коментирано. Белешката се наоѓа близу %{place}.' + commented_note_html: '%{commenter} реши картографска белешка на која имате + коментирано. Белешката се наоѓа близу %{place}.' details: Поподробно за белешката на %{url}. + details_html: Поподробно за белешката на %{url}. changeset_comment_notification: hi: Здраво %{to_user}, greeting: Здраво, @@ -1533,13 +1533,21 @@ mk: subject_other: '[OpenStreetMap] %{commenter} искоментира на промена што ве интересира' your_changeset: '%{commenter} во %{time} даде коментар на една од вашите промени' + your_changeset_html: '%{commenter} во %{time} даде коментар на една од вашите + промени' commented_changeset: '%{commenter} во %{time} даде коментар на променa што ја набљудувате, направена од %{changeset_author}' + commented_changeset_html: '%{commenter} во %{time} даде коментар на променa + што ја набљудувате, направена од %{changeset_author}' partial_changeset_with_comment: со коментарот „%{changeset_comment}“ + partial_changeset_with_comment_html: со коментарот „%{changeset_comment}“ partial_changeset_without_comment: без коментар details: Поподробно за промената на %{url}. + details_html: Поподробно за промената на %{url}. unsubscribe: За да се отпишете од подновите на овие промени, посетете ја страницата %{url} и стиснете на „Отпиши се“. + unsubscribe_html: За да се отпишете од подновите на овие промени, посетете ја + страницата %{url} и стиснете на „Отпиши се“. messages: inbox: title: Примени @@ -1615,6 +1623,24 @@ mk: as_unread: Пораката е означена како непрочитана destroy: destroyed: Пораката е избришана + shared: + markdown_help: + title_html: Расчленето со kramdown + headings: Наслови + heading: Наслов + subheading: Поднаслов + unordered: Неподреден список + ordered: Подреден список + first: Прва ставка + second: Втора ставка + link: Врска + text: Текст + image: Слика + alt: Алтернативен текст + url: URL + richtext_field: + edit: Уреди + preview: Преглед site: about: next: Следно @@ -1812,17 +1838,6 @@ mk: user_page_link: корисничка страница anon_edits_html: (%{link}) anon_edits_link_text: Дознајте зошто ова е така. - flash_player_required_html: Ќе ви треба Flash-програм за да го користите Potlatch - — Flash-уредник за OpenStreetMap. Можете да го - преземете Flash Player од Adobe.com. Имате и неколку - други можности за уредување на OpenStreetMap. - potlatch_unsaved_changes: Имате незачувани промени. (За да зачувате во Potlatch, - треба го одселектирате тековниот пат или точка, ако уредувате во живо, или - стиснете на „зачувај“ ако го имате тоа копче.) - potlatch2_not_configured: Potlatch 2 не е поставен — погледајте ја страницата - https://wiki.openstreetmap.org/wiki/The_Rails_Port - potlatch2_unsaved_changes: Имате незачувани промени. (Зачувувањето во Potlatch - 2 се врши со стискање на „зачувај“.) id_not_configured: Не му се зададени поставки на уредувачкиот програм „iD“ no_iframe_support: Вашиот прелистувач не поддржува „иРамки“ (iframes) со HTML, без кои оваа можност не може да работи. @@ -1932,6 +1947,15 @@ mk: url: https://wiki.openstreetmap.org/wiki/Mk:Main_Page title: Вики на OpenStreetMap description: Прелистајте ја подробната документација за OpenStreetMap на викито. + potlatch: + removed: Вашиот стандарден уредник на OpenStreetMap е наместен да биде Potlatch. + Поради укинувањето на Adobe Flash Player, Potlatch повеќе не е достапен за + употреба во прелистувач. + desktop_html: Сепак, можете да го користите Potlatch со преземајќи + го ова програмче за Mac и Windows. + id_html: Во спротивно, ставете го уредникот iD како стандарден, кој работи на + прелистувачот како што тоа беше со Potlatch. Сменете + си ги корисничките нагодувања овде. sidebar: search_results: Исход од пребарувањето close: Затвори diff --git a/config/locales/mr.yml b/config/locales/mr.yml index 85221255c..d6ec125fc 100644 --- a/config/locales/mr.yml +++ b/config/locales/mr.yml @@ -100,15 +100,9 @@ mr: tagstring: स्वल्पविरामाने परिसीमित editor: default: सामान्यतः (सध्या %{name}) - potlatch: - name: पॉटलॅच १ - description: पॉटलॅच १ (न्याहाळकात चालणारा संपादक) id: name: iD description: iD (न्याहाळकात चालणारा संपादक) - potlatch2: - name: पॉटलॅच २ - description: पॉटलॅच २ (न्याहाळकात चालणारा संपादक) remote: name: सुदूर नियंत्रण description: सुदूर नियंत्रण (JOSM अथवा Merkaartor) @@ -261,12 +255,7 @@ mr: new: title: अनुदिनीत नवी नोंद form: - subject: 'विषय:' - body: 'मायना:' - language: 'भाषा:' location: 'ठिकाण:' - latitude: 'अक्षांश:' - longitude: 'रेखांश:' use_map_link: नकाशा वापरा index: title: सदस्यांच्या अनुदिनी @@ -824,19 +813,11 @@ mr: greeting: नमस्कार! welcome: आपण खातेनिश्चिती केल्यावर,सुरुवात करण्यास आम्ही आपणास अधिकची माहिती देउ - email_confirm_plain: - greeting: नमस्कार, - click_the_link: जर ते आपणच असाल,तर बदलांची खात्री करण्यास खालील दुवा टिचका. - email_confirm_html: + email_confirm: greeting: नमस्कार, click_the_link: जर ते आपणच असाल,तर बदलांची खात्री करण्यास खालील दुवा टिचका. lost_password: subject: '[OpenStreetMap] परवलीचा शब्द पुनर्स्थापन विनंती' - lost_password_plain: - greeting: नमस्कार, - click_the_link: जर ते आपणच असाल,तर परवलीचा शब्द पुनर्स्थापन करण्यास खालील दुवा - टिचका. - lost_password_html: greeting: नमस्कार, click_the_link: जर ते आपणच असाल,तर परवलीचा शब्द पुनर्स्थापन करण्यास खालील दुवा टिचका. diff --git a/config/locales/ms.yml b/config/locales/ms.yml index c8aab4d3a..240471294 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -18,6 +18,8 @@ ms: formats: friendly: '%e %B %Y, %H:%M' helpers: + file: + prompt: Pilih fail submit: diary_comment: create: Simpan @@ -99,7 +101,7 @@ ms: trace: user: Pengguna visible: Kelihatan - name: Nama + name: Nama fail size: Saiz latitude: Garis Lintang longitude: Garis Bujur @@ -120,6 +122,7 @@ ms: description: Keterangan languages: Bahasa pass_crypt: Kata laluan + pass_crypt_confirmation: Sahkan Kata Laluan help: trace: tagstring: terbatas tanda koma @@ -140,21 +143,16 @@ ms: x_years: '%{count} tahun yang lalu' editor: default: Asali (kini %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (alat sunting dalam pelayar) id: name: iD description: iD (editor dalam pelayar) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (alat sunting dalam pelayar) remote: name: Kawalan Jauh description: Kawalan Jauh (JOSM atau Merkaartor) auth: providers: none: Tiada + openid: OpenID google: Google facebook: Facebook windowslive: Windows Live @@ -244,6 +242,7 @@ ms: entry_html: Hubungan %{relation_name} entry_role_html: Hubungan %{relation_name} (sebagai %{relation_role}) not_found: + title: Tidak Dijumpai sorry: 'Maaf, %{type} #%{id} tidak dapat dijumpai.' type: node: nod @@ -342,13 +341,8 @@ ms: new: title: Catatan Diari Baru form: - subject: 'Subjek:' - body: 'Isi:' - language: 'Bahasa:' - location: 'Lokasi:' - latitude: 'Garis Lintang:' - longitude: 'Garis Bujur:' - use_map_link: gunakan peta + location: Lokasi + use_map_link: Guna Peta index: title: Diari pengguna title_friends: Diari kawan @@ -480,6 +474,7 @@ ms: clock: Jam college: Maktab community_centre: Pusat Komuniti + conference_centre: Pusat Persidangan courthouse: Mahkamah crematorium: Bakar Mayat dentist: Doktor Gigi @@ -499,10 +494,12 @@ ms: hunting_stand: Pondok Memburu ice_cream: Aiskrim kindergarten: Tadika + language_school: Sekolah bahasa library: Perpustakaan marketplace: Tempat Pasar monastery: Rumah Ibadah motorcycle_parking: Tempatletak motorsikal + music_school: Sekolah Muzik nightclub: Kelab Malam nursing_home: Rumah Penjagaan parking: Letak Kereta @@ -541,6 +538,7 @@ ms: census: Sempadan Banci national_park: Taman Negara protected_area: Kawasan Terlindung + "yes": Sempadan bridge: aqueduct: Akueduk suspension: Jambatan Gantung @@ -564,6 +562,7 @@ ms: public: Bangunan Awam residential: Bangunan Perumahan retail: Bangunan Peruncitan + roof: Atap school: Bangunan Sekolah terrace: Bangunan Teres train_station: Bangunan Stesen Kereta Api @@ -1117,13 +1116,6 @@ ms: maklumat tambahan untuk permulaan anda. email_confirm: subject: '[OpenStreetMap] Sahkan alamat e-mel anda' - email_confirm_plain: - greeting: Apa khabar, - hopefully_you: Seseorang (harap-harap iaitu anda) ingin menukar alamat e-melnya - di %{server_url} kepada %{new_address}. - click_the_link: Jika anda orangnya, sila klik pautan di bawah untuk mengesahkan - perubahan. - email_confirm_html: greeting: Apa khabar, hopefully_you: Seseorang (harap-harap iaitu anda) ingin menukar alamat e-melnya di %{server_url} kepada %{new_address}. @@ -1131,13 +1123,6 @@ ms: perubahan. lost_password: subject: '[OpenStreetMap] Permohonan mengeset semula kata laluan' - lost_password_plain: - greeting: Apa khabar, - hopefully_you: Seseorang (mungkin anda) telah memohon supaya kata laluan ini - diset semula di akaun openstreetmap.org milik alamat e-mel ini. - click_the_link: Jika anda orangnya, sila klik pautan di bawah untuk mengeset - semula kata laluan anda. - lost_password_html: greeting: Apa khabar, hopefully_you: Seseorang (mungkin anda) telah memohon supaya kata laluan ini diset semula di akaun openstreetmap.org milik alamat e-mel ini. @@ -1248,6 +1233,22 @@ ms: as_unread: Pesanan ditandai sebagai belum dibaca destroy: destroyed: Pesanan dihapuskan + shared: + markdown_help: + headings: Judul + heading: Judul + subheading: Tajuk kecil + unordered: Senarai tidak tertib + ordered: Senarai tertib + first: Butir pertama + second: Butir kedua + link: Pautan + text: Teks + image: Imej + url: URL + richtext_field: + edit: Sunting + preview: Pralihat site: about: next: Berikutnya @@ -1393,16 +1394,6 @@ ms: tatapan umum di %{user_page} anda. user_page_link: laman pengguna anon_edits_link_text: Ketahuilah sebab jadinya begini. - flash_player_required_html: Anda memerlukan pemain Flash untuk menggunakan Potlatch, - iaitu editor OpenStreetMap yang menggunakan Flash. Anda boleh memuat - turun Flash Player dari Adobe.com. Terdapat juga pilihan-pilihan - lain untuk menyunting OpenStreetMap. - potlatch_unsaved_changes: Anda ada perubahan yang belum disimpan. (Untuk menyimpan - dalam Potlatch, anda perlu menyahpilih arah atau titik semasa jika anda menyunting - dalam mod langsung, atau klik simpan jika terdapat butang simpan.) - potlatch2_not_configured: Potlatch 2 belum dikonfigurasikan - sila lihat http://wiki.openstreetmap.org/wiki/The_Rails_Port - potlatch2_unsaved_changes: Anda ada perubahan yang belum disimpan. (Untuk menyimpan - dalam Potlatch 2, anda patut mengklik 'simpan'.) id_not_configured: iD belum dikonfigurasi no_iframe_support: Pelayar web anda tidak menyokong 'iframe' HTML yang diperlukan untuk ciri ini. diff --git a/config/locales/my.yml b/config/locales/my.yml index 4202409da..fab7775a7 100644 --- a/config/locales/my.yml +++ b/config/locales/my.yml @@ -170,13 +170,8 @@ my: commented_at_by_html: '%{user} က %{when} အကြာက မွမ်းမံခဲ့သည်' diary_entries: form: - subject: အကြောင်းအရာ - - body: စာကိုယ် - language: 'ဘာသာစကား:' - location: 'တည်နေရာ:' - latitude: လတ္တီကျု - longitude: လောင်ဂျီကျု - use_map_link: မြေပုံကို အသုံးချ + location: တည်နေရာ + use_map_link: မြေပုံကို အသုံးချရန် index: title: အသုံးပြုသူများ၏ နေ့စဉ်မှတ်တမ်းများ title_friends: မိတ်ဆွေများ၏ နေ့စဉ်မှတ်တမ်းများ @@ -535,13 +530,9 @@ my: hi: ဟိုင်း %{to_user}၊ friendship_notification: hi: ဟိုင်း %{to_user}၊ - email_confirm_plain: - greeting: ဟိုင်း၊ - email_confirm_html: + email_confirm: greeting: ဟိုင်း၊ - lost_password_plain: - greeting: ဟိုင်း၊ - lost_password_html: + lost_password: greeting: ဟိုင်း၊ note_comment_notification: anonymous: အမည်မသိ အသုံးပြုသူတစ်ယောက် @@ -587,6 +578,13 @@ my: to: သို့ sent_message_summary: destroy_button: ဖျက်​ပါ​ + shared: + markdown_help: + text: စာသား + image: ရုပ်ပုံ + richtext_field: + edit: ပြင်ဆင်ရန် + preview: ကြိုတင်အစမ်းကြည့်ရှုရန် site: about: next: ရှေ့ diff --git a/config/locales/nb.yml b/config/locales/nb.yml index c57c518da..ec7907688 100644 --- a/config/locales/nb.yml +++ b/config/locales/nb.yml @@ -182,15 +182,9 @@ nb: other: '%{count} Ã¥r siden' editor: default: Standard (nÃ¥værende %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (redigering i nettleseren) id: name: iD description: iD (redigering i nettleseren) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (redigering i nettleseren) remote: name: Lokalt installert program description: Lokalt installert program (JOSM eller Merkaartor) @@ -396,12 +390,7 @@ nb: new: title: Ny dagboksoppføring form: - subject: 'Emne:' - body: 'Brødtekst:' - language: 'SprÃ¥k:' location: 'Posisjon:' - latitude: 'Breddegrad:' - longitude: 'Lengdegrad:' use_map_link: bruk kart index: title: Brukeres dagbøker @@ -1240,7 +1229,6 @@ nb: footer: Du kan ogsÃ¥ lese kommentaren pÃ¥ %{readurl}, og du kan kommentere pÃ¥ %{commenturl} eller sende forfatteren en melding pÃ¥ %{replyurl} message_notification: - subject_header: '[OpenStreetMap] %{subject}' hi: Hei %{to_user}, header: '%{from_user} har sendt deg en melding gjennom OpenStreetMap med emnet %{subject}:' @@ -1271,29 +1259,16 @@ nb: sÃ¥ du kan komme godt i gang. email_confirm: subject: '[OpenStreetMap] Bekreft din e-postadresse' - email_confirm_plain: greeting: Hei, hopefully_you: Noen (forhÃ¥pentligvis deg) ønsker Ã¥ endre e-postadressen for %{server_url} til %{new_address}. click_the_link: Hvis dette er deg, klikk lenka nedenfor for Ã¥ bekrefte endringen. - email_confirm_html: - greeting: Hei, - hopefully_you: Noen (forhÃ¥pentligvis deg) ønsker Ã¥ endre e-postadressen for - %{server_url} til %{new_address}. - click_the_link: Om dette er deg, klikk pÃ¥ lenken under for Ã¥ bekrefte endringen. lost_password: subject: '[OpenStreetMap] Forespørsel om nullstilling av passord' - lost_password_plain: greeting: Hei, hopefully_you: Noen (forhÃ¥pentligvis deg) har bedt om Ã¥ nullstille passordet for OpenStreetMap-kontoen knyttet til denne e-postadressen. click_the_link: Om dette er deg, klikk pÃ¥ lenken under for Ã¥ tilbakestille passordet. - lost_password_html: - greeting: Hei, - hopefully_you: Noen (forhÃ¥pentligvis deg) har bedt Ã¥ nullstille passordet for - OpenStreetMap-kontoen knyttet til denne e-postadressen. - click_the_link: Hvis det er deg, klikk lenka nedenfor for Ã¥ nullstille passordet - ditt. note_comment_notification: anonymous: En anonym bruker greeting: Hei, @@ -1589,17 +1564,6 @@ nb: det. Du kan gjøre dine redigeringer offentlige fra din %{user_page}. user_page_link: brukerside anon_edits_link_text: Finn ut hvorfor dette er tilfellet. - flash_player_required_html: Du trenger en Flash-spiller for Ã¥ kunne bruke Potlatch - som er Flasheditoren for OpenStreetMap. Du kan laste - ned Flash Player fra Adobe.com. Det - finnes flere alternativer for Ã¥ redigere OpenStreetMap. - potlatch_unsaved_changes: Du har ulagrede endringer. (For Ã¥ lagre i Potlatch, - mÃ¥ du fjerne markeringen av gjeldende vei eller punkt hvis du redigerer i - live-modues eller klikke lagre hvis du har en lagreknapp.) - potlatch2_not_configured: Potlatch 2 har ikke blitt konfigurert - se https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 - for mer informasjon - potlatch2_unsaved_changes: Du har endringer som ikke er lagret. (For Ã¥ lagre - i Potlatch 2, mÃ¥ du klikke lagre.) id_not_configured: iD er ikke satt opp no_iframe_support: Nettleseren din støtter ikke HTML iframes som er nødvendig for denne egenskapen. diff --git a/config/locales/ne.yml b/config/locales/ne.yml index f7effc99f..7425fb315 100644 --- a/config/locales/ne.yml +++ b/config/locales/ne.yml @@ -116,15 +116,9 @@ ne: with_name_html: '%{name} (%{id})' editor: default: पूर्वस्थापित(अहिलेको %{name}) - potlatch: - name: पोटल्याच १ - description: पोटल्याच १ (ब्राउजर सम्पादन) id: name: iD description: iD (ब्राउजर सम्पादक) - potlatch2: - name: पोटल्याच २ - description: पोटल्याच २ (ब्राउजर सम्पादन) remote: name: रिमोट कन्ट्रोल description: रिमोट कन्ट्रोल (JOSM वा Merkaartor) @@ -308,12 +302,7 @@ ne: new: title: नयाँ दैनिकी प्रविष्टी form: - subject: 'विषय:' - body: 'मूख्य भाग:' - language: 'भाषा:' location: 'स्थान:' - latitude: 'देशान्तर:' - longitude: 'अक्षांश:' use_map_link: नक्सा प्रयोगर्ने index: title: प्रयोगकर्ताका डायरीहरू @@ -831,13 +820,9 @@ ne: subject: '[OpenStreetMap] %{user} ले तपाईँलाई मित्रको रूपमा थप्नु भयो' signup_confirm: greeting: नमस्ते! - email_confirm_plain: - greeting: नमस्ते, - email_confirm_html: + email_confirm: greeting: नमस्ते, - lost_password_plain: - greeting: नमस्ते, - lost_password_html: + lost_password: greeting: नमस्ते, note_comment_notification: anonymous: अज्ञात प्रयोगकर्ता diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 58ed91d92..ce2177a86 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -213,15 +213,9 @@ nl: other: '%{count} jaar geleden' editor: default: Standaard (op dit moment %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (bewerken in de browser) id: name: iD description: iD (bewerken in de browser) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (bewerken in de browser) remote: name: Afstandsbediening description: Afstandsbediening (JOSM of Merkaartor) @@ -435,12 +429,7 @@ nl: new: title: Nieuw dagboekbericht form: - subject: 'Onderwerp:' - body: 'Tekst:' - language: 'Taal:' location: 'Plaats:' - latitude: 'Breedtegraad:' - longitude: 'Lengtegraad:' use_map_link: kaart gebruiken index: title: Gebruikersdagboeken @@ -1310,32 +1299,18 @@ nl: zodat u aan de slag kunt. email_confirm: subject: '[OpenStreetMap] Bevestig uw e-mailadres' - email_confirm_plain: greeting: Hallo, hopefully_you: Iemand - hopelijk u - wil zijn/haar e-mailadres op %{server_url} wijzigen naar %{new_address}. click_the_link: Als u dit bent, klik dan op de onderstaande koppeling om de wijziging te bevestigen. - email_confirm_html: - greeting: Hallo, - hopefully_you: Iemand - hopelijk u - wil zijn e-mailadres op %{server_url} wijzigen - naar %{new_address}. - click_the_link: Als u dit bent, klik dan op de onderstaande koppeling om de - wijziging te bevestigen. lost_password: subject: '[OpenStreetMap] Verzoek wachtwoord opnieuw instellen' - lost_password_plain: greeting: Hallo, hopefully_you: Iemand - mogelijk u - heeft aangevraagd om het wachtwoord opnieuw in te stellen voor de gebruiker met dit e-mailadres op openstreetmap.org. click_the_link: Als u dit bent, klik dan op de onderstaande koppeling om uw wachtwoord opnieuw in te stellen. - lost_password_html: - greeting: Hallo, - hopefully_you: Iemand - mogelijk u - heeft aangevraagd om het wachtwoord opnieuw - in te stellen voor de gebruiker met dit e-mailadres op openstreetmap.org. - click_the_link: Als u dit bent, klik dan op de onderstaande koppeling om uw - wachtwoord te wijzigen. note_comment_notification: anonymous: Een anonieme gebruiker greeting: Hallo, @@ -1652,17 +1627,6 @@ nl: u uw bewerkingen openbaar maakt. U kunt deze instelling maken op uw %{user_page}. user_page_link: gebruikerspagina anon_edits_link_text: Lees waarom dit het geval is. - flash_player_required_html: U hebt Flash-player nodig om Potlatch, de OpenStreetMap - Flash-editor te gebruiken. U kunt Flash-player - van Adobe.com downloaden. Er - zijn ook andere opties om OpenStreetMap te bewerken. - potlatch_unsaved_changes: U hebt wijzigingen gemaakt die nog niet zijn opgeslagen. - Om op te slaan in Potlach, deselecteert u de huidige weg of het huidige punt - als u in livemodus bewerkt, of klikt u op de knop Opslaan. - potlatch2_not_configured: Potlatch 2 is niet ingesteld – zie https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 - voor meer informatie - potlatch2_unsaved_changes: U hebt wijzigingen die nog niet zijn opgeslagen. - Om op te slaan in Potlatch 2 moet u op "Opslaan" klikken. id_not_configured: iD is niet ingesteld no_iframe_support: Uw browser ondersteunt geen iframes HTML die nodig zijn voor deze functie. diff --git a/config/locales/nn.yml b/config/locales/nn.yml index cd3fc477f..54497f015 100644 --- a/config/locales/nn.yml +++ b/config/locales/nn.yml @@ -1,6 +1,7 @@ # Messages for Norwegian Nynorsk (norsk nynorsk) # Exported from translatewiki.net # Export driver: phpyaml +# Author: Abaksle # Author: Abijeet Patro # Author: Bjorni # Author: Dittaeva @@ -36,7 +37,7 @@ nn: create: Send client_application: create: Registrer - update: Rediger + update: Oppdater redaction: create: Lag maskering update: Lagre markering @@ -49,7 +50,7 @@ nn: activerecord: errors: messages: - invalid_email_address: ser ikkje uttil Ã¥ vera ei gyldig e-postadresse + invalid_email_address: ser ikkje ut til Ã¥ vere ei gyldig e-postadresse email_address_not_routable: kan ikkje rutast models: acl: Tilgangskontrolliste @@ -89,6 +90,7 @@ nn: way_tag: Vegmerkelapp attributes: client_application: + name: Namn (PÃ¥kravd) callback_url: 'URL for tilbakekall:' support_url: Støytte-URL diary_comment: @@ -105,13 +107,13 @@ nn: trace: user: Brukar visible: Synleg - name: Namn + name: Filnamn size: Storleik latitude: Breiddegrad longitude: Lengdegrad public: Offentleg description: Skildring - gpx_file: 'Last opp GPX-fil:' + gpx_file: Last opp GPX-fil visibility: 'Synligheit:' tagstring: 'Merkelappar:' message: @@ -126,53 +128,89 @@ nn: description: Skildring languages: SprÃ¥k pass_crypt: Passord + pass_crypt_confirmation: Stadfest passord help: trace: tagstring: kommaseparert + datetime: + distance_in_words_ago: + about_x_hours: + one: omkring 1 time sidan + other: omkring %{count} timar sidan + about_x_months: + one: omkring 1 mÃ¥nad sidan + other: omkring %{count} mÃ¥nader sidan + about_x_years: + one: omkring 1 Ã¥r sidan + other: omkring %{count} Ã¥r sidan + almost_x_years: + one: nesten 1 Ã¥r sidan + other: nesten %{count} Ã¥r sidan + less_than_x_seconds: + one: mindre enn 1 sekund sidan + other: mindre enn %{count} sekund sidan + less_than_x_minutes: + one: mindre enn eit minutt sidan + other: mindre enn %{count} minutt sidan + over_x_years: + one: over 1 Ã¥r sidan + other: over %{count} Ã¥r sidan + x_seconds: + one: 1 sekund sidan + other: '%{count} sekund sidan' + x_minutes: + one: 1 minutt sidan + other: '%{count} minutt sidan' + x_months: + one: 1 mÃ¥nad sidan + other: '%{count} mÃ¥nader sidan' + x_years: + one: 1 Ã¥r sidan + other: '%{count} Ã¥r sidan' printable_name: with_version: '%{id}, v%{version}' editor: default: Standard (noverande %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (rediger i nettlesaren) id: - name: ID - description: iD (redigering i nettlesaren) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (rediger i nettleseran) + name: iD + description: iD (i nettlesaren) remote: - name: Lokalt installert program + name: lokalt installert program description: Lokalt installert program (JOSM eller Merkaartor) auth: providers: + openid: OpenID + google: Google + facebook: Facebook + windowslive: Windows Live + github: GitHub wikipedia: Wikipedia api: notes: comment: opened_at_html: Oppretta for %{when} sidan opened_at_by_html: Oppretta for %{when} sidan av %{user} - commented_at_html: Oppdatert for %{when} sidan - commented_at_by_html: Oppdatert for %{when} sidan av %{user} - closed_at_html: Løyst for %{when} sidan - closed_at_by_html: Løyst for %{when} sidan av %{user} - reopened_at_html: Reaktivert for %{when} sidan - reopened_at_by_html: Reaktivert %{when} sidan av %{user} + commented_at_html: Oppdatert %{when} + commented_at_by_html: Oppdatert %{when} av %{user} + closed_at_html: Løyst %{when} + closed_at_by_html: Løyst %{when} av %{user} + reopened_at_html: Opna att %{when} + reopened_at_by_html: Opna att %{when} av %{user} rss: title: OpenStreetMap-merknadar + commented: ny kommentar (nær %{place}) entry: comment: Kommentar full: Fullstendig merknad browse: created: Oppretta closed: Attlaten - created_html: Oppretta for %{time} sidan - closed_html: Stengt %{time} sidan - created_by_html: Oppretta for %{time} sidan av %{user} - deleted_by_html: Sletta for %{time} sidan av %{user} - edited_by_html: Redigert for %{time} sidan av %{user} - closed_by_html: Stengt for %{time} sidan by %{user} + created_html: Oppretta %{time} + closed_html: Lukka %{time} + created_by_html: Oppretta %{time} av %{user} + deleted_by_html: Sletta %{time} av %{user} + edited_by_html: Redigert %{time} av %{user} + closed_by_html: Lukka %{time} av %{user} version: 'Versjon:' anonymous: anonym no_comment: (ingen kommentar) @@ -263,8 +301,7 @@ nn: opened_by_html: Oppretta av %{user} %{when} sidan opened_by_anonymous_html: Oppretta av anonym %{when} sidan - commented_by_html: Kommentar frÃ¥ %{user} %{when} - sidan + commented_by_html: Kommentar frÃ¥ %{user} %{when} commented_by_anonymous_html: Kommentar frÃ¥ anonym %{when} sidan closed_by_html: Løyst av %{user} %{when} sidan @@ -274,6 +311,7 @@ nn: sidan reopened_by_anonymous_html: Reaktivert av anonym for %{when} sidan + report: Rapporter denne merknaden query: title: Førespurnadsfunksjonar nearby: Nærliggjande funksjonar @@ -281,7 +319,7 @@ nn: changeset_paging_nav: showing_page: Side %{page} next: Neste » - previous: « Forrige + previous: « Førre changeset: anonymous: Anonym no_edits: (ingen redigeringar) @@ -296,11 +334,11 @@ nn: title: Endringssett title_user: Endringssett av %{user} title_friend: Endringssett av venene dine - title_nearby: Endringssett av naboar + title_nearby: Endringssett av brukarar i nærleiken empty: Fann ingen endringssett. empty_area: Ingen endringssett i dette omrÃ¥det. empty_user: Ingen endringssett av denne brukaren. - no_more: Fann ingen fleire endringssett. + no_more: Fann ikkje fleire endringssett. no_more_area: Ingen fleire endringssett i dette omrÃ¥det. no_more_user: Ingen fleire endringssett av denne brukaren. load_more: Last inn meir @@ -313,12 +351,7 @@ nn: new: title: Ny dagbokoppføring form: - subject: 'Emne:' - body: 'Brødtekst:' - language: 'SprÃ¥k:' location: 'Posisjon:' - latitude: 'Breiddegrad:' - longitude: 'Lengdegrad:' use_map_link: bruk kart index: title: Brukarane sine dagbøker @@ -328,7 +361,7 @@ nn: in_language_title: Dagbokoppføringar pÃ¥ %{language} new: Ny dagbokoppføring new_title: Skriv ei ny oppføring i dagboka di - no_entries: Ingen oppføringer i dagboka + no_entries: Ingen oppføringar i dagboka recent_entries: Nye oppføringer i dagboka older_entries: Eldre oppføringar newer_entries: Nyare oppføringar @@ -361,6 +394,7 @@ nn: comment_from_html: Kommentar frÃ¥ %{link_user}, %{comment_created_at} hide_link: Skjul denne kommentaren confirm: Stadfest + report: Rapporter denne kommentaren location: location: 'Posisjon:' view: Vis @@ -648,7 +682,7 @@ nn: reservoir_watershed: Nedbørfelt residential: BoligomrÃ¥de retail: Detaljsalg - village_green: landsbypark + village_green: Landsbypark vineyard: VingÃ¥rd "yes": Arealbruk leisure: @@ -917,6 +951,12 @@ nn: results: no_results: Ingen resultat funne more_results: Fleire resultat + reports: + new: + categories: + note: + spam_label: Denne merknaden er søppel + abusive_label: Denne merknaden er støytande layouts: project_name: title: OpenStreetMap @@ -942,9 +982,10 @@ nn: edit_with: Rediger med %{editor} tag_line: Fritt Wiki-verdenskart intro_header: Velkomen til OpenStreetMap! - intro_text: OpenStreetMap er eit verdskart, laga av folks som deg, det er ope - og gratis Ã¥ bruke, med ein open lisens. + intro_text: OpenStreetMap er eit verdskart, laga av folk som deg. Kartet er gratis + Ã¥ bruke under ein open lisens. intro_2_create_account: Opprett ein brukarkonto + hosting_partners_html: Drifta er støtta av %{ucl}, %{bytemark} og andre %{partners}. partners_ucl: UCL VR-senteret partners_bytemark: Bytemark Hosting partners_partners: partnarar @@ -976,7 +1017,6 @@ nn: footer: Du kan òg lese kommentaren pÃ¥ %{readurl} og du kan kommentere pÃ¥ %{commenturl} eller svare pÃ¥ %{replyurl} message_notification: - subject_header: '[OpenStreetMap] %{subject}' hi: Hei %{to_user}, header: '%{from_user} har sendt deg ei melding gjennom OpenStreetMap med emnet %{subject}:' @@ -1005,27 +1045,13 @@ nn: igang. email_confirm: subject: '[OpenStreetMap] Stadfest di e-postadresse' - email_confirm_plain: greeting: Hei, click_the_link: Viss det er deg, klikk lenkja nedanfor for Ã¥ stadfeste endringa. - email_confirm_html: - greeting: Hei, - hopefully_you: Nokre (vonleg du) ynskjer Ã¥ endre registrert e-postadresse pÃ¥ - %{server_url} til %{new_address}. - click_the_link: Om dette er deg, vennligst klikk pÃ¥ lenkja under for Ã¥ stadfeste - endringa. lost_password: subject: '[OpenStreetMap] Førespurnad om nullstilling av passord' - lost_password_plain: greeting: Hei, click_the_link: Om dette er deg, vennligst klikk pÃ¥ lenkja under for Ã¥ tilbakestille passordet. - lost_password_html: - greeting: Hei, - hopefully_you: Nokre (vonleg deg) har bede Ã¥ nullstille passordet for OpenStreetMap-kontoen - knytt til denne e-postadressa. - click_the_link: Viss det er deg, klikk lenkja nedanfor for Ã¥ nullstille passordet - ditt. note_comment_notification: anonymous: Ein anonym brukar greeting: Hei, @@ -1242,16 +1268,6 @@ nn: user_page_link: brukarside anon_edits_html: (%{link}) anon_edits_link_text: Finn ut kvifor dette er tilfellet. - flash_player_required_html: Du treng ein Flash-spelar for Ã¥ kunne bruke Potlatch, - Flasheditoren for OpenStreetMap. Du kan laste - ned Flash Player frÃ¥ Adobe.com. Fleire - andre alternativ er òg tilgjengeleg for redigering av OpenStreetMap. - potlatch_unsaved_changes: Du har ulagra endringar. (For Ã¥ lagre i Potlatch, - mÃ¥ du fjerne markeringa av gjeldande veg eller punkt viss du redigerer i live-modues - eller klikke lagre viss du har ein lagreknapp.) - potlatch2_not_configured: Potlatch 2 har ikkje vorte konfigurert - sjÃ¥ http://wiki.openstreetmap.org/wiki/The_rails_port - potlatch2_unsaved_changes: Du har endringar som ikkje er lagra. (For Ã¥ lagre - i Potlatch 2, mÃ¥ du klikke lagre.) id_not_configured: iD er ikkje konfigurert no_iframe_support: Nettlesaren din støttar ikkje HTML iframes som er naudsynt for denne eigenskapen. @@ -1676,6 +1692,9 @@ nn: ein konto. Me vil prøve Ã¥ handsame førespurnaden sÃ¥ fort som mogleg. about: header: Fri og redigerbar + html: |- +

I motsetnad til andre kart, er heile OpenStreetMap laga av folk som deg. Alle står fritt til å rette, oppdatere, laste ned og bruke kartet.

+

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

email address: 'E-postadresse:' confirm email address: 'Stadfest e-postadresse:' not_displayed_publicly_html: Ikkje vist offentleg (sjÃ¥ %{title}%{time} %{user} ߓߟߏ߫ + version: ߦߌߟߡߊ in_changeset: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫ anonymous: ߕߐ߯ߒߕߊ߲ + no_comment: (ߡߙߌߣߊ߲߫ ߕߴߦߋ߲߬) part_of: ߝߊ߲߭ ߘߏ߫ download_xml: XML ߟߊߖߌ߰ ߌ ߞߎ߲߬ view_history: ߘߐ߬ߝߐ ߘߐߜߍ߫ @@ -176,7 +185,14 @@ nqo: changeset: title: 'ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊ߬ߝߊ߬ߟߋ߲߬ߠߌ߲: %{id}' belongs_to: ߛߓߍߦߟߊ + way: ߛߌߟߊ (%{count}) + relation: ߕߍߓߊ߯ߦߊ (%{count}) + relation_paginated: ߕߍߓߊ߯ߦߊ (%{x}-%{y} %{count}) + comment: ߡߙߌߣߊ߲ (%{count}) + hidden_commented_by_html: ߡߙߌߣߊ߲ ߢߢߊߘߏ߲߯ߠߌ߲ %{user} ߡߊ߬ %{when} + commented_by_html: ߦߟߌߣߐ ߡߍ߲ ߝߘߊߣߍ߲߫ ߦߋ߫ %{user} ߟߊ߫ %{when} changesetxml: XML ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫ + osmchangexml: ߏ.ߛ.ß¡ ߡߝߊ߬ߟߋ߲߬ߠߌ߲ XML join_discussion: ߌ ߜߊ߲߬ߞߎ߲߫ ߞߊ߬ ߕߘߍ߬ ߡߙߌߣߊ߲߫ ߦߌߘߊ ߘߐ߫ discussion: ߘߊߘߐߖߊߥߏ way: @@ -286,11 +302,7 @@ nqo: new: title: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߞߎߘߊ form: - subject: 'ߝߐߡߊ:' - body: 'ߝߊ߬ߘߌ:' - language: 'ߞߊ߲:' location: 'ߘߌ߲߬ߞߌߙߊ:' - latitude: ߓߊߙߌ use_map_link: ߔߊ߬ߔߘߊ ߟߊߓߊ߯ߙߊ߫ index: title: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߎ߬ ߕߋ߬ߟߋ߲ @@ -394,12 +406,16 @@ nqo: bbq: BBQ bicycle_repair_station: ߣߍ߰ߛߏ߬ ߘߐ߬ߓߍ߲߬ ߦߌߟߊ biergarten: ߢߐ߬ߘߟߐ ߣߊߞߐ + blood_bank: ߖߋ߬ߟߌ߬ ߟߊ߬ߡߙߊ߬ ߦߙߐ boat_rental: ߕߊߞߎߟߎ߲߫ ߛߎߝߙߎ߫ ߦߙߐ + brothel: ߛߎ߲ߞߘߎ߲ߓߊߓߏ߲ bus_station: ߞߎߟߎ߲ߓߏ߲߫ ߟߐ߫ ߦߙߐ cafe: ߞߊߝߋ car_rental: ߞߐ߲߬ߛߏ߬ ߛߎ߬ߝߙߎ߬ ߦߙߐ car_wash: ߞߐ߲߬ߛߏ߬ ߞߏ߬ ߦߌߟߊ + casino: ߞߊߛߌߣߏ childcare: ߘߋ߲ߣߍ߲߫ ߠߊߡߙߊ߫ ߦߌߟߊ + cinema: ߖߌߦߊ߬ߝߟߍ clinic: ߓߎ߬ߙߋ (ߞߑߟߣߌߞ) clock: ߕߎ߬ߡߊ߬ߟߊ߲ college: ߞߊ߬ߙߊ߲߬ߘߊ @@ -416,6 +432,7 @@ nqo: internet_cafe: ߓߟߐߟߐ߫ ߞߊߝߋ language_school: ߞߊ߲߫ ߞߊߙߊ߲ߕߊ library: ߛߓߍߘߊ + love_hotel: ߦߙߊ߬ߓߌ ߖߌ߬ߦߊ߬ߓߏ߲ marketplace: ߟߐ߯ߝߍ ߘߌ߲߬ߞߌߙߊ mobile_money_agent: ߜߋߟߋ߲ߜߋߟߋ߲ ߥߏߘߌ ߖߋ߬ߕߌ߰ߘߊ money_transfer: ߥߏߘߌ߫ ߟߕߊߡߌ߲߫ ߦߙߐ @@ -423,9 +440,13 @@ nqo: music_school: ߘߐ߲߬ߞߟߌ߬ ߞߊߙߊ߲ߕߊ nightclub: ߘߐ߲߬ߓߏ߲ parking: ߞߐ߲߬ߛߏ߬ߜߘߋ + parking_space: ߟߐ߬ߟߌ߬ ߞߣߍ pharmacy: ߓߊߛߌߓߏ߲ + place_of_worship: ߟߐ߲ߠߌ߲ߦߊ ߘߌ߲߬ߞߌߙߊ police: ߕߐ߲ߓߟߏߡߊ prison: ߥߛߎߓߏ߲ + public_bath: ߝߘߏ߬ߓߊ߬ ߞߏ߬ߦߙߐ + public_bookcase: ߝߘߏ߬ߓߊ߬ ߛߓߍߘߊ public_building: ߝߘߏ߬ߓߊ߬ ߓߏ߲ restaurant: ߘߊߥߎ߲ߠߌ߲߫ ߦߙߐ school: ߞߊ߬ߙߊ߲߬ߕߊ @@ -445,6 +466,7 @@ nqo: weighbridge: ߖߌߘߊ߲ߕߊ߫ ߛߍ߲ boundary: protected_area: ߦߙߐ߫ ߟߊߞߊ߲ߘߊߣߍ߲ + "yes": ߓߐߕߏ߲ bridge: suspension: ߛߍ߲߫ ߠߊߘߎ߲ߣߍ߲ "yes": ߛߍ߲ @@ -454,6 +476,7 @@ nqo: hospital: ߘߊ߲ߘߊߛߏ ߓߏ߲ hotel: ߖߌ߬ߦߊ߬ߓߏ߲ house: ߟߎ + manufacture: ߝߊ߲ߓߏ߲ public: ߝߘߏ߬ߓߊ߬ ߓߏ߲ school: ߞߊ߬ߙߊ߲߬ߕߊ university: ߖߊ߯ߓߘߊ ߓߏ߲ @@ -465,7 +488,10 @@ nqo: plumber: ߘߎ߰ߡߊ߬ߟߊ߬ߟߊ shoemaker: ߛߊ߬ߡߘߊ߬ ߘߐ߬ߓߍ߲߬ߠߊ tailor: ߞߙߊߟߌߟߊ + emergency: + landing_site: ߓߙߊ߬ߒ߬ߘߐ߬ ߖߌ߰ߟߌ߬ ߞߣߍ highway: + abandoned: ߝߏ߲߬ߘߏ߬ ߡߊߓߌ߬ߟߊ߬ߣߍ߲ bus_stop: ߞߎߟߎ߲ߓߏ߲߫ ߘߟߐߦߙߐ construction: ߝߏ߲߬ߘߏ ߡߍ߲ ߓߐ ߦߴߌ ߘߐ߫ living_street: ߛߏߞߣߐ߫ ߛߌߟߊ @@ -505,6 +531,7 @@ nqo: swimming_pool: ߣߊߥߎߠߌ߲߫ ߘߟߊ man_made: bridge: ߛߍ߲ + mine: ߘߊ߬ߡߊ߲ telescope: ߝߏ߬ߣߊ߲߬ߦߋ߬ߟߊ߲ tower: ߛߊ߲ߓߏ߲ water_tower: ߖߌߡߣߐ @@ -524,8 +551,11 @@ nqo: wood: ߦߙߌ office: government: ߞߎ߲߬ߠߊ߬ߛߌ߮ ߟߊ߫ ߛߓߍߘߊ + newspaper: ߝߐ߰ߓߍ߬ ߛߓߍ߬ߘߊ߮ ngo: ߛ.ߘ.ߞ ߛߓߍߘߊ + religion: ߣߊߡߎ߲ ߛߓߍߘߊ telecommunication: ߓߌ߬ߟߊ߬ߢߐ߲߱ߡߊ ߛߓߍߘߊ + travel_agent: ߕߐ߰ߕߐ߰ߟߌ߬ ߗߋߘߊ "yes": ߛߓߍߘߊ place: country: ߖߡߊ߬ߣߊ @@ -544,7 +574,9 @@ nqo: construction: ߣߍ߰ߛߌߟߊ ߡߍ߲ ߦߋ߫ ߓߏ߲߫ ߟߐ߬ߣߍ߲ ߠߎ߬ ߞߘߐ߫ halt: ߛߌ߬ߛߌ߬ߞߎߟߎ߲ ߟߐ߬ߦߙߐ junction: ߣߍ߰ߛߌߟߊ ߓߍ߲߬ߕߍ + station: ߣߍ߰ߛߌߟߊ ߟߐ߬ߘߊ߮ stop: ߛߌ߬ߛߌ߬ߞߎߟߎ߲ ߟߐ߬ߦߙߐ + subway: ߘߎ߰ߞߘߐ߬ߛߌߟߊ shop: art: ߞߎ߬ߛߊ߲߬ߧߊ ߛߎ߲ߞߎ߲ bag: ߓߘߐ߬ ߝߎ߲ߞߎ߲ @@ -559,11 +591,13 @@ nqo: coffee: ߞߊߝߋ߫ ߝߎ߲ߞߎ߲ computer: ߕߟߋ߬ߓߊ߰ ߝߎ߲ߞߎ߲ cosmetics: ߡߊ߬ߡߎ߲߬ߕߟߎ ߝߎ߲ߞߎ߲ + doityourself: ߞߵߊ߬ ߞߴߌ ߖߘߍ߬ߦߋ߫ e-cigarette: ߢߎߡߍߙߋ߲߫ ߛߙߊߡߟߋߞߋ ߝߎ߲ߞߎ߲ electronics: ߢߎߡߍߙߋ߲߫ ߝߎ߲ߞߎ߲ erotic: ߋߙߏߕߌߞ ߝߎ߲ߞߎ߲ farm: ߛߣߍ߬ߞߍ߬ߝߋ߲߬ ߝߎ߲ߞߎ߲ fashion: ߘߐ߬ߓߍ߲߬ߠߌ߲߬ ߖߐ߯ߙߊ߲ ߝߎ߲ߞߎ߲ + food: ߛߎ߬ߡߊ߲߬ ߝߎ߲ߞߎ߲ gas: ߥߊߦߌ߲߫ ߝߎ߲ߞߎ߲ hairdresser: ߞߎ߲߬ ߘߐ߬ߓߍ߲߬ ߦߌߟߊ hardware: ߛߎ߲ߝߘߍ߫ ߝߎ߲ߞߎ߲ @@ -582,6 +616,7 @@ nqo: tattoo: ߥߍ߬ߢߍ߲ ߝߎ߲ߞߎ߲ tea: ߕߋ߫ ߝߎ߲ߞߎ߲ tobacco: ߖߊ߲߬ߓߊ߬ ߝߎ߲ߞߎ߲ + travel_agency: ߕߐ߰ߕߐ߰ߟߌ߬ߟߊ ߟߎ߬ tyres: ߞߐ߲߬ߡߘߊ߬ ߝߎ߲ߞߎ߲ variety_store: ߢߌ߰ߡߌ߬ߢߊ߰ߡߊ߬ ߝߎ߲ߞߎ߲ video: ߖߌ߬ߦߊ߬ߖߟߎ߬ ߝߎ߲ߞߎ߲ @@ -594,11 +629,13 @@ nqo: museum: ߗߍߓߏ߲ zoo: ߥߘߊߓߊ ߝߟߍ߫ ߛߏ waterway: + artificial: ߖߛߌߟߊ߫ ߟߊߘߊ߲ߣߍ߲ river: ߓߊ waterfall: ߖߌ߫ ߛߎߙߎ߲ߘߎ "yes": ߖߛߌߟߊ admin_levels: level2: ߖߡߊ߬ߣߊ ߓߐߕߏ߲ + level3: ߕߌ߲߬ߞߎߘߎ߲ ߓߐߕߏ߲ level4: ߞߊ߬ߝߏ ߓߐߕߏ߲ level5: ߕߌ߲ߞߎߘߎ߲ ߓߐߕߏ߲ level6: ߖߡߊ߬ߣߊ ߓߐߕߏ߲ @@ -618,6 +655,7 @@ nqo: search_guidance: ߓߐ߲ߘߊ ߘߏ߫ ߢߌߣߌ߲߫ user_not_found: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߏ߬ ߕߴߦߋ߲߬ issues_not_found: ߒ߬ߒ߫ ߓߐ߲ߘߊ߫ ߛߎ߮ ߏ߬ ߡߊ߫ ߛߐ߬ߘߐ߲߫ + reported_item: ߝߛߌ߬ ߟߊߞߏߝߐߣߍ߲ states: ignored: ߊ߬ ߡߊߓߌ߬ߟߊ߬ߣߍ߲߫ open: ߊ߬ ߟߊߞߊ߬ @@ -627,9 +665,34 @@ nqo: successful_update: ߌ ߟߊ߫ ߟߊ߬ߢߌߣߌ߲ ߓߘߊ߫ ߓߊ߲߫ ߠߊߞߎ߲߬ߘߎ߫ ߟߊ߫ ߞߏߟߌߞߏߟߌ߫ provide_details: ߝߊߙߊ߲ߝߊ߯ߛߌ߫ ߡߊߢߌ߬ߣߌ߲߬ߞߊ߬ߣߍ߲ ߠߎ߬ ߡߊߛߐ߫ ߖߊ߰ߣߌ߲߫ show: + report_created_at: ߞߏߝߐߟߌ߫ ߝߟߐ ߞߍ߫ ߘߊ߫ %{datetime} + last_resolved_at: ߢߊߓߐߟߌ߫ ߟߊߓߊ߲ ߞߍ߫ ߘߊ߫ %{datetime} + last_updated_at: ߊ߬ ߟߊߛߋ߫ ߟߊߓߊ߲ ߞߍ߫ ߘߊ߫ ߘߊߞߎ߲ ߘߐ߫ %{datetime} ߊ߬ ߣߌ߫ %{displayname} + ߓߟߏ߫ resolve: ߊ߬ ߢߊߓߐ߫ ignore: ߊ߬ ߡߋߓߌ߬ߟߊ߫ reopen: ߊ߬ ߟߊߞߊ߬ ߕߎ߲߯ + reports_of_this_issue: ߝߌ߬ߛߌ ߣߌ߲߬ ߠߊߞߏߝߐߟߌ + read_reports: ߞߏߝߐߟߌ ߟߎ߬ ߘߐߞߊ߬ߙߊ߲߬ + new_reports: ߞߏߝߐߟߌ߫ ߞߎߘߊ ߟߎ߬ + other_issues_against_this_user: ߝߛߌ߬ ߜߘߍ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߓߟߏ߫ ߌߞߐ߫ + no_other_issues: ߝߛߌ߬ ߜߘߍ߫ ߕߍ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߓߟߴߏ߬ ߞߐ߫. + comments_on_this_issue: ߡߙߌߣߊ߲ ߡߍ߲ ߠߎ߬ ߦߋ߫ ߝߌ߬ߛߌ ߣߌ߲߬ ߠߊ߫ + resolve: + resolved: ߝߌ߬ߛߌ ߟߌ߬ߤߟߊ ߓߘߊ߫ ߘߐߓߍ߲߬ ߊ߬ ߢߊߓߐ߫ ߞߊ߲ߡߊ߬ + ignore: + ignored: ߝߌ߬ߛߌ ߟߌ߬ߤߟߊ ߓߘߊ߫ ߘߐߓߍ߲߬ ߊ߬ ߡߊߓߌ߬ߟߊ߬ ߞߊ߲ߡߊ߬ + reopen: + reopened: ߝߌ߬ߛߌ ߟߌ߬ߤߟߊ ߓߘߊ߫ ߘߐߓߍ߲߬ ߊ߬ ߘߊߦߟߍ߬ ߞߊ߲ߡߊ߬ + comments: + comment_from_html: ߡߙߌߣߊ߲ ߞߊ߬ ߝߘߊ߫ %{user_link} ߟߊ߫ %{comment_created_at} ߘߐ߫ + helper: + reportable_title: + diary_comment: '%{entry_title} ߡߙߌߣߊ߲ #%{comment_id}' + note: 'ߦߟߌߣߐ #%{note_id}' + issue_comments: + create: + comment_created: ߌ ߟߊ߫ ߡߙߌߣߊ߲ ߛߌ߲ߘߟߌ ߓߘߊ߫ ߛߎߘߊ߲߫ reports: new: categories: @@ -692,6 +755,7 @@ nqo: header: '%{from_user} ߓߘߊ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߘߏ߫ ߡߓߊߟߌߡߊ߫ ߝߐߡߊ %{subject} ߘߌ߫' message_notification: + subject: '[ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ] %{message_title}' hi: '%{to_user} ߣߌ߫ ߕߎ߬ߡߊ߬' header: '%{from_user} ߓߘߊ߫ ߗߋߛߓߍ ߘߏ߫ ߗߋ߫ ߌ ߡߊ߬ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߛߌߟߊ ߝߍ߬ ߝߐߡߊ %{subject} ߘߌ߫:' @@ -703,6 +767,7 @@ nqo: had_added_you: '%{user} ߓߘߴߌ ߝߙߊ߬ ߕߋߙߌ ߟߎ߬ ߟߊ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߞߊ߲߬.' befriend_them: ߌ ߝߣߊ߫ ߘߌ߫ ߛߴߊ߬ߟߎ߫ ߝߙߊ߬ ߟߊ߫ ߕߋߙߌ ߟߎ߬ ߟߊ߫ %{befriendurl} ߘߐ߫ gpx_failure: + hi: '%{to_user} ߣߌ߫ ߕߎ߬ߡߊ߬' failed_to_import: 'ߟߊ߬ߛߣߍ߬ߟߌ߬ ߗߌߙߏ߲ߣߍ߲. ߝߎ߬ߕߎ߲߬ߕߌ ߦߋ߫ ߦߊ߲߬:' import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures subject: '[ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ] GPX ߟߊߛߣߍߟߌ ߓߘߊ߫ ߗߌߙߏ߲߫' @@ -719,28 +784,13 @@ nqo: ߜߘߍ߫ ߟߊ߫ ߛߴߌ ߘߴߊ߬ ߘߐߝߘߊ߫. email_confirm: subject: '[[ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ]] ߌ ߟߊ߫ ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߟߊߛߙߋߦߊ߫' - email_confirm_plain: greeting: ߌ ߣߌ߫ ߕߎ߬ߡߊ߬߸ hopefully_you: ߡߐ߱ ߘߏ߫ (ߖߌ߱ ߟߊߣߴߌ ߘߐ߫) ߊ߬ߟߎ߬ ߦߴߊ߬ ߝߍ߬ ߞߵߊ߬ߟߎ߬ ߟߊ߫ ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߟߊߛߙߋߦߊ߫ %{server_url} ߘߐ߫ %{new_address} ߟߊ߫. click_the_link: ߣߴߏ߬ ߞߍ߫ ߘߴߌߟߋ ߘߌ߫߸ ߘߎ߰ߟߊ߬ߘߐ߫ ߛߘߌߜߋ߲ ߛߐ߲߬ߞߌ߲߫ ߞߊ߬ ߡߝߊ߬ߟߋ߲߬ߠߌ߲ ߟߊߛߙߋߦߊ߫. - email_confirm_html: - greeting: ߌ ߣߌ߫ ߕߎ߬ߡߊ߬߸ - hopefully_you: ߡߐ߱ ߘߏ߫ (ߖߌ߱ ߟߊߣߴߌ ߘߐ߫) ߊ߬ߟߎ߬ ߦߴߊ߬ ߝߍ߬ ߞߵߊ߬ߟߎ߬ ߟߊ߫ ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ - ߡߊߝߊ߬ߟߋ߲߬ %{server_url} ߘߐ߫ %{new_address} ߟߊ߫. - click_the_link: ߣߴߏ߬ ߞߍ߫ ߘߴߌߟߋ ߘߌ߫߸ ߘߎ߰ߟߊ߬ߘߐ߫ ߛߘߌߜߋ߲ ߛߐ߲߬ߞߌ߲߫ ߞߊ߬ ߡߝߊ߬ߟߋ߲߬ߠߌ߲ - ߟߊߛߙߋߦߊ߫. lost_password: subject: '[ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ] ߕߊ߬ߡߌ߲߬ߞߊ߲߬ ߡߊߦߟߍߡߊ߲ ߡߊߢߌ߬ߣߌ߲߬ߞߊ' - lost_password_plain: - greeting: ߌ ߣߌ߫ ߕߎ߬ߡߊ߬߸ - hopefully_you: ߡߐ߱ ߘߏ߫ (ߊ߬ ߘߌ߫ ߛߋ߫ ߞߍ߫ ߟߴߌ ߖߍ߬ߘߍ ߘߌ߫) ߓߘߊ߫ ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ ߞߍ߫ - ߕߊ߬ߡߌ߲߬ߞߊ߲߬ ߡߊߦߟߍߡߊ߲ ߡߊ߬ ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߟߊ߫ openstreetmap.org ߖߊ߬ߕߋ߬ߘߊ - ߣߌ߲߬ ߞߊ߲߬. - click_the_link: ߣߴߊ߬ ߞߍ߫ ߘߴߌߟߋ ߘߌ߫߸ ߘߎ߰ߟߊ߬ߘߐ߫ ߛߘߌߜߋ߲ ߣߌ߲߬ ߛߐ߲߬ߞߌ߲߫ ߖߊ߰ߣߌ߲߫ ߞߵߌ - ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߝߊ߬ߟߋ߲߬. - lost_password_html: greeting: ߌ ߣߌ߫ ߕߎ߬ߡߊ߬߸ hopefully_you: ߡߐ߱ ߘߏ߫ (ߊ߬ ߘߌ߫ ߛߋ߫ ߞߍ߫ ߟߴߌ ߖߍ߬ߘߍ ߘߌ߫) ߓߘߊ߫ ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ ߞߍ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲߬ ߡߊߦߟߍߡߊ߲ ߡߊ߬ ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߟߊ߫ openstreetmap.org ߖߊ߬ߕߋ߬ߘߊ @@ -762,6 +812,10 @@ nqo: partial_changeset_without_comment: ߞߵߊ߬ ߕߘߍ߬ ߡߙߌߣߊ߲߫ ߕߍ߫ messages: inbox: + title: ߗߋߛߓߍ߫ ߟߊߣߊ߬ߣߍ߲ + my_inbox: ߒ ߠߊ߫ ߞߏ߲߬ߘߏ ߞߣߐߟߊ + outbox: ߞߐߞߊ߲߫ ߞߏ߲ߘߏ + messages: '%{new_messages} ߟߎ߬ ߣߌ߫ %{old_messages} ߠߎ߬ ߦߴߌ ߓߟߏ߫' from: ߞߊ߬ ߝߘߊ߫ subject: ߝߐߡߊ date: ߕߎ߬ߡߊ߬ߘߊ @@ -821,12 +875,32 @@ nqo: as_unread: ߗߋߛߓߍ ߓߘߊ߫ ߣߐ߬ߣߐ߬ ߞߊ߬ߙߊ߲߬ߓߊߟߌ ߘߌ߫ destroy: destroyed: ߗߋߛߓߍ ߓߘߊ߫ ߖߏ߬ߛߌ߫ + shared: + markdown_help: + headings: ߞߎ߲߬ߕߐ߮ + heading: ߞߎ߲߬ߕߐ߮ + subheading: ߞߎ߲߬ߕߐ߰ߘߎ߯ߟߊ + unordered: ߛߙߍߘߍ߫ ߡߊߞߟߌߓߊߟߌ + ordered: ߛߙߍߘߍ߫ ߡߊߞߟߌߣߍ߲ + first: ߝߛߌ߬ ߝߟߐ + second: ߝߛߌ߬ ߝߌߟߊߣߊ߲ + link: ߛߘߌ߬ߜߋ߲ + text: ߞߟߏߘߋ߲ + image: ߖߌ߬ߦߊ߬ߓߍ + url: URL + richtext_field: + edit: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫ + preview: ߟߊ߬ߕߎ߲߰ߠߊ site: about: next: ߢߍߕߊ copyright_html: ©ßß”ߌ߲߫ ߛߑߕߙߌߕ ߡߊߔ
ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ ߠߎ߬ used_by_html: '%{name} ߓߘߊ߫ ߡߊߔ ߘߕߊ ߡߊߛߐ߫ ߓߟߐߟߐ߫ ߞߍߦߙߐ ߥߊ߯ ߦߙߌߞߊ ߟߊ߫. ߜߋߟߋ߲ߜߋߟߋ߲ ߟߥߊ߬ߟߌ߬ߟߊ߲ ߣߌ߫ ߞߍߟߊ߲߫ ߛߎ߲ߝߘߍߡߊ ߟߎ߬' + lede_text: "ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߟߊߘߊ߲ߣߍ߲߫ ߦߋ߫ ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߊ ߘߍ߬ߘߊ ߟߎ߬ ߟߋ߬ ߓߟߏ߫ ߡߍ߲ + ߠߎ߬ ߦߋ߫ ߡߊ߬ߜߍ߲ ߞߍ߫ ߟߊ߫ ߓߟߏߡߟߊߞߏ ߘߐ߫߸ ߊ߬ ߣߌ߫ ߞߵߊ߬ ߘߊߘߐߓߍ߲߬. \nߞߊ߬ ߓߍ߲߬ ߛߌߟߊ + ߟߎ߬ ߡߊ߬߸ ߜߋ߬ߙߋ ߟߎ߬ ߡߊ߬߸ ߞߊߝߋ ߟߎ߬ ߡߊ߬߸ ߣߍ߰ߛߌߟߊ ߟߐ߬ߦߙߐ ߟߎ߬ ߡߊ߬߸ ߊ߬ ߣߌ߫ ߝߋ߲߫ + ߜߘߍ߫ ߛߌߦߊߡߊ߲߫ ߠߎ߫ ߘߎߢߊ߫ ߝߊ߲߭ ߓߍ߯ ߝߍ߬." local_knowledge_title: ߕߌ߲߬ߞߎߘߎ߲ ߡߊ߬ߟߐ߲߬ߠߌ߲ community_driven_title: ߘߍ߬ߘߊ ߟߊ߬ߓߏ߬ߙߌ߬ߟߌ open_data_title: ߓߟߏߡߟߊ߫ ߘߊߦߟߍ߬ߣߍ߲ @@ -842,16 +916,31 @@ nqo: title_html: ߓߊߦߟߍߡߊ߲ ߤߊߞߍ ߣߌ߫ ߕߌ߰ߦߊ credit_title_html: ߟߊߒߣߦߊ ߦߋ߫ ߛߐ߬ߘߐ߲߬ ߠߊ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߟߊ߫ ߘߌ߬ index: + permalink: ߛߘߌ߬ߜߋ߲߬ ߓߟߏߕߍ߰ߓߊߟߌ + shortlink: ߛߘߌ߬ߜߋ߲߬ ߛߎߘߎ߲ createnote: ߦߟߌߣߐ ߘߏ߫ ߝߙߊ߬ + license: + copyright: ߓߊߦߟߍߡߊ߲ ߤߊߞߍ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߣߌ߫ ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ߠߊ ߟߎ߬߸ ߕߦߊ߫ ߘߊߦߟߍ߬ߣߍ߲ + ߞߘߐ߫ + edit: + not_public: ߌ ߡߴߌ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߠߎ߬ ߘߊߘߐߓߍ߲߬ ߛߴߊ߬ߟߎ߫ ߘߌ߫ ߞߍ߫ ߝߘߏ߬ߓߊ߬ߡߊ߫ + ߘߌ߫. + not_public_description_html: ߌ ߕߍߣߊ߬ ߛߋ߫ ߟߊ߫ ߡߍ߲߫ ߠߊ߫ ߡߊߔ ߡߊߦߟߍ߬ߡߊ߲ ߘߊߞߘߐ߫ ߣߴߌ + ߡߴߊ߬ ߞߍ߫ ߕߋ߲߬. ߌ ߘߌ߫ ߛߴߌ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߠߎ߬ ߘߊߘߐߓߍ߲߬ ߠߊ߫ ߝߘߏ߬ߓߊ߬ߡߊ ߘߴߌ + ߟߊ߫ %{user_page} ߞߣߐ߫. + user_page_link: ߞߐߜߍ߫ ߟߊߓߊ߯ߙߕߊ export: title: ߟߊ߬ߝߏ߬ߦߌ߬ߟߌ area_to_export: ߟߊ߬ߝߏ߬ߦߌ߬ߟߌ ߞߍ߫ ߦߙߐ manually_select: ߦߙߐ߫ ߓߐߣߍ߲ߢߐ߲߰ߡߊ ߟߎ߬ ߓߊߕߐ߬ߡߐ߲߬ ߓߟߏߟߕߊߦߊ ߘߐ߫ too_large: + planet: + title: ߖߊ߯ߓߊߟߌ OSM other: title: ߛߎ߲߫ ߜߘߍ ߟߎ߬ description: ߊ߬ ߛߎ߲߫ ߞߏ ߡߞߊ߬ߝߏ߬ߟߌ߬ ߜߘߍ߫ ߟߎ߫ ߛߙߍߘߍ ߦߋ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߥߞߌ ߞߊ߲߬ + options: ߢߣߊߕߊߟߌ format: ߖߙߎߡߎ߲ image_size: ߖߌ߬ߦߊ߬ߓߍ ߢߊ߲ߞߊ߲ zoom: ߡߛߊ߬ߡߊ߲߬ߠߌ߲ @@ -861,7 +950,29 @@ nqo: title: ߝߙߋߞߋ ߘߏ߫ ߟߊߞߏߝߐ߫\ߔߊ߬ߔߘߊ ߘߐߓߍ߲߬ how_to_help: title: ߘߍ߬ߡߍ߲ ߦߋ߫ ߞߍ߫ ߟߊ߫ ߘߌ߬ + join_the_community: + title: ߕߘߍ߬ ߘߍ߬ߘߊ ߘߏ߫ ߘߐ߫ help: + title: ߘߍ߬ߡߍ߲߬ߠߌ߲ ߡߊߛߐ߬ߘߐ߲ + introduction: ߛߎ߲߫ ߥߙߍߓߊߓߊ ߟߎ߬ ߟߋ߬ ߦߋ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߓߟߏ߫ ߖߊ߬ߕߋ߬ߘߐ߬ߛߌ߮ ߟߎ߬ + ߘߐߞߊ߬ߙߊ߲߬ ߞߊ߲ߡߊ߬߸ ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ ߣߌ߫ ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ߫ ߖߋߓߌ ߟߎ߬ ߘߐ߫߸ ߊ߬ ߣߌ߫ ߘߊߘߐߖߊߥߏ + ߣߝߊ߬ߢߐ߲߰ߦߊ ߣߌ߫ ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߌ ߞߎ߲߬ߕߐ߮ ߟߎ߬ ߘߐ߬ߛߙߋ߬ߦߊ߬ߟߌ ߟߎ߬ ߘߐ߫. + welcome: + url: /welcome + title: ߌ ߣߌ߫ ߛߣߍ߫ ߏߔߌ߲߫ ߛߕߑߙߌߕ ߡߊߔ ߞߊ߲߬߹ + beginners_guide: + url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide + title: ߘߊߡߌߣߊߟߌߟߊ ߟߎ߬ ߢߍߡߌߘߊ + description: ߘߍ߬ߘߊ ߦߋ߫ ߢߍߡߌߘߊ ߘߏ߫ ߘߐߓߍ߲߬ ߠߊ߫ ߘߊߡߌߣߊߟߌߟߊ ߟߎ߬ ߦߋ߫. + help: + url: https://help.openstreetmap.org/ + title: ߘߍ߬ߡߍ߲߬ߠߌ߲ ߟߐ߯ߓߊߟߐ + description: ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ ߘߏ߫ ߞߍ߫ ߤߊߡߊ߲ߕߍ߫ ߞߊ߬ ߖߋ߬ߓߌ ߘߏ߫ ߟߎ߫ ߡߊߝߟߍ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ + ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ-ߣߴߊ߬-ߖߋ߬ߓߌ ߞߍߦߙߐ ߞߊ߲߬. + mailing_lists: + title: ߢߎߡߍߙߋ߲ߦߊߟߌ ߛߙߍߘߍ ߟߎ߬ + forums: + title: ߟߐ߯ߓߊߟߐ wiki: url: https://wiki.openstreetmap.org/ title: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߥߞߌ @@ -878,4 +989,66 @@ nqo: where_am_i: ߣߌ߲߬ ߦߋ߫ ߡߌ߲߫؟ where_am_i_title: ߛߋ߲߬ߠߊ߫ ߘߌ߲ߞߌߙߊ ߛߓߍ߫ ߡߍ߲ ߠߊߓߊ߯ߙߊߣߍ߲߫ ߦߋ߫ ߕߌߙߌ߲ߠߌ߲߫ ߣߌߘߐ ߓߟߏ߫ submit_text: ߕߊ߯ + key: + table: + entry: + footway: ߛߋ߲߬ߡߊ߬ߛߌߟߊ + rail: ߣߍ߰ߛߌߟߊ + subway: ߘߎ߰ߞߘߐ߬ߛߌߟߊ + cable: + - ߘߎ߲ߞߎߟߎ߲ + admin: ߓߐߕߏ߲߫ ߞߎ߲߬ߠߊ߬ߛߌ߰ߟߊ߬ߞߊ + forest: ߕߎ + wood: ߦߙߌ + industrial: ߘߍ߲߰ߦߊ߬ߟߌ ߕߌ߲߬ߞߎߘߎ߲ + commercial: ߖߊ߬ߥߏ ߘߌ߲߬ߞߌߙߊ + lake: + - ߞߐ߰ߖߌ߬ߘߟߊ + farm: ߝߏ߬ߘߏ + cemetery: ߞߊߓߙߎߟߏ + centre: ߝߊ߬ߘߌ߬ߡߊ߬ߞߟߏ ߕߊ߲ߓߊ߲ + reserve: ߛߎ߲ߞߎ߲ ߦߙߐ߫ ߟߊߕߏߣߍ߲ + military: ߣߊ߲߬ߕߌ߰ ߕߌ߲ߞߎߘߎ߲ + school: + - ߞߊ߬ߙߊ߲߬ߕߊ + - ߖߊ߯ߓߘߊ + station: ߣߍ߰ߛߌߟߊ ߟߐ߬ߘߊ߮ + construction: ߛߌߟߊ ߡߍ߲ ߟߊ ߦߴߌ ߘߐ߫ + bicycle_shop: ߣߍ߰ߛߏ߬ ߝߎ߲ߞߎ߲ + bicycle_parking: ߣߍ߰ߛߏ߬ ߟߐ߬ߘߊ߮ + toilets: ߢߍ߲߮ + richtext_area: + edit: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߫ + preview: ߊ߬ ߘߐߜߍ߫ ߡߎߣߎ߲߬ + markdown_help: + title_html: ߊ߬ ߟߊߦߟߍ߬ߣߍ߲߬ ߦߋ߫ kramdown + ߟߋ߬ ߟߊ߫ + headings: ߞߎ߲߬ߕߐ߮ + heading: ߞߎ߲߬ߕߐ߮ + subheading: ߞߎ߲߬ߕߐ߰ߘߎ߯ߟߊ + unordered: ߛߙߍߘߍ߫ ߡߊߞߟߌߓߊߟߌ + ordered: ߛߙߍߘߍ߫ ߡߊߞߟߌߣߍ߲ + first: ߝߛߌ߬ ߝߟߐ + second: ߝߛߌ߬ ߝߌߟߊߣߊ߲ + link: ߛߘߌ߬ߜߋ߲ + text: ߞߟߏߘߋ߲ + image: ߖߌ߬ߦߊ߬ߓߍ + url: URL + welcome: + title: ߊߟߎ߫ ߣߌ߫ ߛߣߍ߫߹ + whats_on_the_map: + title: ߡߎ߲߬ ߠߋ߬ ߦߋ߫ ߡߊߔ ߞߊ߲߬ + start_mapping: ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߌ ߘߊߡߌ߬ߣߊ߫ + add_a_note: + title: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߕߎ߬ߡߊ߬ ߕߴߦߋ߲߬؟ ߦߟߌߣߐ ߘߏ߫ ߝߙߊ߬߹ + traces: + new: + help: ߘߍ߬ߡߍ߲߬ߠߌ߲ + help_url: https://wiki.openstreetmap.org/ߥߞߌ/ߟߊ߬ߦߟߍ߬ߟߌ + show: + map: ߡߊߔ + edit: ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߬ + owner: 'ߊ߬ ߕߌ߱:' + description: 'ߞߊ߲߬ߛߓߍߟߌ:' + tags: 'ߘߎ߲ߛߓߍ ߟߎ߬:' ... diff --git a/config/locales/oc.yml b/config/locales/oc.yml index d6f1bc88b..a27c5b602 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -163,15 +163,9 @@ oc: other: fa près de %{count} d'ans editor: default: Per defaut (actualament %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (editor integrat au navigador) id: name: iD description: iD (editor integrat al navigador) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (editor integrat au navigador) remote: name: Editor extèrne description: Editor extèrne (JOSM o Merkaartor) @@ -384,12 +378,7 @@ oc: new: title: Novèla entrada de jornau form: - subject: 'Subjècte :' - body: 'Còrs :' - language: 'Lenga :' location: 'Luòc :' - latitude: 'Latitud :' - longitude: 'Longitud :' use_map_link: Utilizar la mapa index: title: Jornaus deis utilizaires @@ -1239,32 +1228,18 @@ oc: perque poscatz començar. email_confirm: subject: '[OpenStreetMap] Confirmacion de vòstra adreça de corrièr electronic' - email_confirm_plain: greeting: Bonjorn, hopefully_you: Qualqu’un (vos, esperam-lo) voldriá modificar son adreça de corrièr electronic sus %{server_url} en %{new_address}. click_the_link: Se sètz a l'origina d'aquesta requèsta, clicatz sul ligam çaijós per confirmar aquesta modificacion. - email_confirm_html: - greeting: Bonjorn, - hopefully_you: Qualqu’un (vos, esperam-lo) voldriá cambiar son adreça de corrièr - electronic de %{server_url} en %{new_address}. - click_the_link: Se sètz vos, clicatz sul ligam çaijós per confirmar aquesta - la modificacion. lost_password: subject: '[OpenStreetMap] Demanda de reïnicializacion del senhal' - lost_password_plain: greeting: Bonjorn, hopefully_you: Quauqu’un (possiblament vos) a demandat que lo senhau d'aqueu còmpte openstreetmap.org siegue remandat a vòstra adreiça de corrier electronic. click_the_link: Se sètz a l'origina d'aquesta requèsta, clicatz sul ligam çaijós per reïnicializar vòstre senhal. - lost_password_html: - greeting: Bonjorn, - hopefully_you: Quauqu’un (possiblament vos) a demandat de restaurar lo senhau - dau còmpte openstreetmap.org liat a aquesta adreiça de corrier electronic. - click_the_link: Se sètz vos, clicatz sul ligam çaijós per reïnicializar vòstre - senhal. note_comment_notification: anonymous: Un utilizaire anonim greeting: Bonjorn, @@ -1520,8 +1495,6 @@ oc: not_public: Avètz pas reglat vòstras modificacions per que sián publicas. user_page_link: pagina d'utilizaire anon_edits_link_text: Trobatz perqué aicí. - potlatch2_unsaved_changes: Avètz de modificacions pas salvadas. (Per salvar - vòstras modificacions dins Potlach2, clicar sus "enregistrar".) id_not_configured: iD es pas estat configurat export: title: Exportar diff --git a/config/locales/pa.yml b/config/locales/pa.yml index cd18d3874..d7240d099 100644 --- a/config/locales/pa.yml +++ b/config/locales/pa.yml @@ -209,12 +209,7 @@ pa: load_more: ਹੋਰ ਲੋਡ ਕਰੋ diary_entries: form: - subject: 'ਵਿਸ਼ਾ:' - body: 'ਧੜ੍ਹ:' - language: 'ਬੋਲੀ:' location: 'ਸਥਿਤੀ:' - latitude: 'ਅਕਸ਼ਾਂਸ਼:' - longitude: 'ਰੇਖਾਂਸ਼:' use_map_link: ਨਕਸ਼ਾ ਵਰਤੋ show: leave_a_comment: ਕੋਈ ਟਿੱਪਣੀ ਛੱਡੋ @@ -730,13 +725,9 @@ pa: user_mailer: signup_confirm: greeting: ਸਤਿ ਸ੍ਰੀ ਅਕਾਲ ਜੀ! - email_confirm_plain: - greeting: ਸਤਿ ਸ੍ਰੀ ਅਕਾਲ, - email_confirm_html: + email_confirm: greeting: ਸਤਿ ਸ੍ਰੀ ਅਕਾਲ, - lost_password_plain: - greeting: ਸਤਿ ਸ੍ਰੀ ਅਕਾਲ, - lost_password_html: + lost_password: greeting: ਸਤਿ ਸ੍ਰੀ ਅਕਾਲ, note_comment_notification: anonymous: ਇੱਕ ਗੁੰਮਨਾਮ ਵਰਤੋਂਕਾਰ diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 069e222b6..873b0c70c 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -5,6 +5,7 @@ # Author: Abijeet Patro # Author: Ajank # Author: Alan ffm +# Author: Alefar # Author: Andrzej aa # Author: Anwar2 # Author: BdgwksxD @@ -252,18 +253,12 @@ pl: with_name_html: '%{name}(%{id})' editor: default: edytorze domyślnym (obecnie %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (w przeglądarce) id: name: iD description: iD (w tej przeglądarce) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (w tej przeglądarce) remote: name: Zewnętrzny edytor - description: zewnętrznym edytorze (JOSM lub Merkaartor) + description: zewnętrznym edytorze (JOSM, Potlatch lub Merkaartor) auth: providers: none: Brak @@ -491,12 +486,7 @@ pl: new: title: Nowy wpis do dziennika form: - subject: 'Temat:' - body: 'Treść:' - language: 'Język:' location: 'Położenie:' - latitude: 'Szerokość geograficzna:' - longitude: 'Długość geograficzna:' use_map_link: wskaż na mapie index: title: Dzienniki użytkowników @@ -526,7 +516,8 @@ pl: body: Niestety nie odnaleziono wpisu dziennika lub komentarza o identyfikatorze %{id}. Proszę sprawdzić pisownię lub może kliknięty odnośnik jest niepoprawny. diary_entry: - posted_by_html: Opublikowany przez %{link_user}, %{created} w języku %{language_link} + posted_by_html: Opublikowany przez %{link_user}, %{created} w języku %{language_link}. + updated_at_html: Ostatnio zaktualizowany %{updated}. comment_link: Skomentuj ten wpis reply_link: Napisz do autora comment_count: @@ -752,10 +743,10 @@ pl: church: Budynek kościoła civic: Budynek miejski college: Budynek koledżu / szkoły policealnej - commercial: Budynek handlowy + commercial: Budynek komercyjny construction: Budynek w budowie detached: Dom wolnostojący - dormitory: Bursa + dormitory: Dom studencki duplex: Bliźniak farm: Dom mieszkalny na farmie farm_auxiliary: Budynek gospodarczy @@ -771,10 +762,10 @@ pl: industrial: Budynek przemysłowy kindergarten: Budynek przedszkola manufacture: Budynek fabryczny - office: Budynek biurowy + office: Biurowiec public: Budynek publiczny residential: Budynek mieszkalny - retail: Budynek detaliczny + retail: Budynek handlu detalicznego roof: Zadaszenie ruins: Ruiny budynku school: Budynek szkoły @@ -786,7 +777,7 @@ pl: temple: Budynek świątyni terrace: Domy szeregowe train_station: Budynek dworca - university: Budynek uniwersytetu + university: Budynek uczelni warehouse: Magazyn "yes": Budynek club: @@ -888,7 +879,7 @@ pl: bomb_crater: Lej bombowy battlefield: Miejsce historycznej bitwy boundary_stone: Graniczny głaz - building: Budynek historyczny + building: Zabytkowy budynek bunker: Bunkier cannon: Działo castle: Zamek @@ -934,7 +925,7 @@ pl: forest: Las garages: Garaże grass: Trawnik - greenfield: Tereny niezagospodarowane + greenfield: Teren niezabudowany industrial: Teren przemysłowy landfill: Składowisko odpadów meadow: Łąka @@ -957,7 +948,7 @@ pl: adult_gaming_centre: Salon gier hazardowych amusement_arcade: Salon gier bandstand: Estrada - beach_resort: Strzeżona plaża + beach_resort: Ośrodek plażowy bird_hide: Czatownia ornitologiczna bleachers: Odkryta trybuna bowling_alley: Kręgielnia @@ -973,7 +964,7 @@ pl: horse_riding: Jazda konna ice_rink: Lodowisko marina: Marina - miniature_golf: Pole do miniaturowego golfa + miniature_golf: Minigolf nature_reserve: Rezerwat przyrody outdoor_seating: Ogródek park: Park @@ -1074,7 +1065,7 @@ pl: land: Ląd marsh: Bagno moor: Wrzosowisko - mud: Muł + mud: Błoto peak: Szczyt point: Punkt reef: Rafa @@ -1082,7 +1073,7 @@ pl: rock: Skała saddle: Przełęcz sand: Piaski - scree: Piarg + scree: Rumowisko skalne scrub: Zarośla spring: Źródło wodne stone: Głaz @@ -1100,7 +1091,7 @@ pl: advertising_agency: Agencja reklamowa architect: Architekt association: Stowarzyszenie - company: Przedsiębiorstwo + company: Biuro firmy diplomatic: Placówka dyplomatyczna educational_institution: Instytucja edukacyjna employment_agency: Urząd pracy @@ -1152,7 +1143,7 @@ pl: railway: abandoned: Dawna linia kolejowa construction: Budowana linia kolejowa - disused: Nieczynna linia kolejowa + disused: Nieużywany tor funicular: Kolej linowo-terenowa halt: Przystanek kolejowy junction: Węzeł kolejowy @@ -1205,21 +1196,21 @@ pl: confectionery: Sklep ze słodyczami convenience: Sklep ogólnospożywczy copyshop: Ksero - cosmetics: Sklep kosmetyczny + cosmetics: Sklep z kosmetykami craft: Sklep z artykułami dla artystów curtain: Sklep z zasłonami dairy: Sklep z nabiałem deli: Delikatesy department_store: Dom towarowy discount: Sklep z produktami po obniżce - doityourself: Sklep budowlany + doityourself: Market budowlany dry_cleaning: Pralnia chemiczna e-cigarette: Sklep z e-papierosami - electronics: Sklep elektroniczny + electronics: Sklep z elektroniką/RTV/AGD erotic: Sklep erotyczny estate_agent: Biuro nieruchomości fabric: Sklep z tkaninami - farm: Sklep gospodarski + farm: Stragan świeżych produktów fashion: Sklep odzieżowy fishing: Sklep wędkarski florist: Kwiaciarnia @@ -1239,7 +1230,7 @@ pl: hearing_aids: Sklep z aparatami słuchowymi herbalist: Sklep zielarski hifi: Sklep ze sprzętem hi-fi - houseware: Sklep z artykułami gospodarstwa domowego + houseware: Sklep z małymi artykułami gospodarstwa domowego ice_cream: Sklep z lodami interior_decoration: Sklep z dekoracją wnętrz jewelry: Sklep z biżuterią @@ -1253,14 +1244,14 @@ pl: medical_supply: Sklep ze sprzętem medycznym mobile_phone: Sklep z telefonami komórkowymi money_lender: Pożyczki - motorcycle: Sklep z motocyklami + motorcycle: Sklep motocyklowy motorcycle_repair: Warsztat motocyklowy music: Sklep muzyczny musical_instrument: Sklep z instrumentami muzycznymi newsagent: Sklep z prasą nutrition_supplements: Sklep z suplementami diety optician: Optyk - organic: Sklep z produktami organicznymi + organic: Sklep z ekologiczną żywnością outdoor: Sklep turystyczny paint: Sklep z farbami pastry: Cukiernia @@ -1281,12 +1272,12 @@ pl: tattoo: Studio tatuażu tea: Sklep z herbatą ticket: Kasa biletowa - tobacco: Sklep z artykułami tytoniowymi + tobacco: Sklep z tytoniem toys: Sklep z zabawkami travel_agency: Biuro podróży tyres: Sklep z oponami - vacant: Sklep zamknięty - variety_store: Mały sklep wielobranżowy + vacant: Pusty lokal sklepowy + variety_store: Sklep z różnościami video: Sklep wideo/DVD video_games: Sklep z grami wideo wholesale: Hurtownia @@ -1297,7 +1288,7 @@ pl: apartment: Mieszkanie na wynajem artwork: Dzieło sztuki attraction: Atrakcja turystyczna - bed_and_breakfast: Bed and Breakfast + bed_and_breakfast: Bed and breakfast cabin: Domek letniskowy camp_pitch: Miejsce na kempingu camp_site: Kemping @@ -1320,7 +1311,7 @@ pl: culvert: Przepust "yes": Tunel waterway: - artificial: Sztuczne zbiorniki wodne + artificial: Sztuczny ciek boatyard: Stocznia canal: Kanał dam: Zapora wodna @@ -1340,12 +1331,15 @@ pl: "yes": Ciek admin_levels: level2: Granica kraju + level3: Granica regionu level4: Granica level5: Granica regionu level6: Granica powiatu + level7: Granica gminy level8: Granica miejscowości level9: Granica dzielnicy level10: Granica przedmieścia + level11: Granica osiedla types: cities: Miasta towns: Miasta @@ -1362,7 +1356,7 @@ pl: reported_user: Zgłoszony użytkownik not_updated: Niezaktualizowane search: Wyszukaj - search_guidance: Przeszukaj sprawy + search_guidance: 'Przeszukaj sprawy:' user_not_found: Użytkownik nie istnieje issues_not_found: Nie znaleziono takiej sprawy status: Stan @@ -1515,12 +1509,20 @@ pl: hi: Witaj %{to_user}, header: '%{from_user} zostawił(a) komentarz do wpisu w dzienniku OpenStreetMap o temacie %{subject}:' + header_html: '%{from_user} zostawił(a) komentarz do wpisu w dzienniku OpenStreetMap + o temacie %{subject}:' footer: Możesz również przeczytać komentarz pod %{readurl}, skomentować go pod %{commenturl} lub wysłać wiadomość do autora pod %{replyurl} + footer_html: Możesz również przeczytać komentarz pod %{readurl}, skomentować + go pod %{commenturl} lub wysłać wiadomość do autora pod %{replyurl} message_notification: - subject_header: '[OpenStreetMap] %{subject}' + subject: '[OpenStreetMap] %{message_title}' hi: Witaj %{to_user}, header: '%{from_user} wysłał do ciebie wiadomość z OpenStreetMap o temacie %{subject}:' + header_html: '%{from_user} wysłał do ciebie wiadomość z OpenStreetMap o temacie + %{subject}:' + footer: Możesz również przeczytać wiadomość na %{readurl} i wysłać wiadomość + do autora na %{replyurl} footer_html: Możesz również przeczytać wiadomość na %{readurl} i wysłać wiadomość do autora na %{replyurl} friendship_notification: @@ -1528,7 +1530,9 @@ pl: subject: '[OpenStreetMap] Użytkownik %{user} dodał cię jako znajomego' had_added_you: '%{user} dodał(a) cię jako swojego znajomego na OpenStreetMap.' see_their_profile: Możesz zobaczyć jego profil na stronie %{userurl}. + see_their_profile_html: Możesz zobaczyć jego profil na stronie %{userurl}. befriend_them: Możesz również dodać go jako znajomego na %{befriendurl}. + befriend_them_html: Możesz również dodać go jako znajomego na %{befriendurl}. gpx_description: description_with_tags_html: 'Wygląda na to, że twój plik GPX %{trace_name} z opisem %{trace_description} i tagami: %{tags}' @@ -1553,34 +1557,22 @@ pl: subject: '[OpenStreetMap] Witamy w OpenStreetMap' greeting: Cześć! created: Ktoś (mamy nadzieję, że ty) właśnie założył konto w %{site_url}. - confirm: 'Musimy upewnić się, że wniosek pochodzi od ciebie, dlatego kliknij - na łącze poniżej, aby potwierdzić założenie konta:' + confirm: 'Musimy się upewnić, że ta prośba pochodzi od ciebie, dlatego kliknij + łącze poniżej, aby potwierdzić założenie konta:' welcome: Po potwierdzeniu konta dostarczymy ci dodatkowych informacji o tym, jak zacząć. email_confirm: subject: '[OpenStreetMap] Potwierdzenie adresu e-mail' - email_confirm_plain: greeting: Cześć, hopefully_you: Ktoś (prawdopodobnie ty) chce zmienić adres e-mail w %{server_url} na %{new_address}. - click_the_link: Jeśli to ty, kliknij na poniższy link, aby potwierdzić zmianę. - email_confirm_html: - greeting: Cześć, - hopefully_you: Ktoś (prawdopodobnie ty) chce zmienić adres e-mail w %{server_url} - na %{new_address}. - click_the_link: Jeśli to ty, kliknij na poniższy link, aby potwierdzić zmianę. + click_the_link: Jeśli to ty, kliknij poniższy link, aby potwierdzić zmianę. lost_password: subject: '[OpenStreetMap] Prośba zmiany hasła' - lost_password_plain: greeting: Cześć, hopefully_you: Ktoś (prawdopodobnie ty) poprosił o zresetowanie hasła do konta w serwisie openstreetmap.org dla tego adresu e-mail. click_the_link: Jeśli to ty, kliknij poniższy odnośnik, aby wyczyścić hasło. - lost_password_html: - greeting: Witaj, - hopefully_you: Ktoś (prawdopodobnie ty) poprosił o zresetowanie hasła do konta - w serwisie openstreetmap.org dla tego adresu e-mail. - click_the_link: Jeśli to ty, kliknij poniższy odnośnik, aby wyczyścić hasło. note_comment_notification: anonymous: Anonimowy użytkownik greeting: Witaj, @@ -1590,15 +1582,23 @@ pl: uwagę' your_note: '%{commenter} zostawił komentarz do jednej z twoich uwag na mapie w lokalizacji: %{place}.' + your_note_html: '%{commenter} zostawił komentarz do jednej z twoich uwag na + mapie w lokalizacji: %{place}.' commented_note: Użytkownik %{commenter} zostawił komentarz do skomentowanej uwagi. Znajduje się ona w położeniu %{place}. + commented_note_html: Użytkownik %{commenter} zostawił komentarz do skomentowanej + uwagi. Znajduje się ona w położeniu %{place}. closed: subject_own: '[OpenStreetMap] %{commenter} rozwiązał twoją uwagę' subject_other: '[OpenStreetMap] %{commenter} rozwiązał interesującą cię uwagę' your_note: '%{commenter} rozwiązał jedną z twoich uwag na mapie w lokalizacji: %{place}.' + your_note_html: '%{commenter} rozwiązał jedną z twoich uwag na mapie w lokalizacji: + %{place}.' commented_note: 'Użytkownik %{commenter} rozwiązał skomentowaną uwagę. Znajduje się ona w położeniu: %{place}.' + commented_note_html: 'Użytkownik %{commenter} rozwiązał skomentowaną uwagę. + Znajduje się ona w położeniu: %{place}.' reopened: subject_own: '[OpenStreetMap] %{commenter} ponownie aktywował jedną z twoich uwag' @@ -1606,9 +1606,14 @@ pl: cię uwagę' your_note: '%{commenter} ponownie aktywował jedną z twoich uwag na mapie w lokalizacji: %{place}' + your_note_html: '%{commenter} ponownie aktywował jedną z twoich uwag na mapie + w lokalizacji: %{place}' commented_note: Użytkownik %{commenter} ponownie aktywował skomentowaną uwagę. Znajduje się ona w położeniu %{place}. + commented_note_html: Użytkownik %{commenter} ponownie aktywował skomentowaną + uwagę. Znajduje się ona w położeniu %{place}. details: 'Więcej informacji na temat uwagi można znaleźć pod adresem: %{url}.' + details_html: 'Więcej informacji na temat uwagi można znaleźć pod adresem: %{url}.' changeset_comment_notification: hi: Witaj %{to_user}, greeting: Cześć, @@ -1618,14 +1623,23 @@ pl: subject_other: '[OpenStreetMap] %{commenter} skomentował zestaw zmian' your_changeset: '%{commenter} zostawił komentarz do jednego z twoich zestawów zmian, utworzony %{time}' + your_changeset_html: '%{commenter} zostawił komentarz do jednego z twoich + zestawów zmian, utworzony %{time}' commented_changeset: '%{commenter} zostawił komentarz do zestawu zmian użytkownika %{changeset_author}, który śledzisz, utworzony %{time}' + commented_changeset_html: '%{commenter} zostawił komentarz do zestawu zmian + użytkownika %{changeset_author}, który śledzisz, utworzony %{time}' partial_changeset_with_comment: z komentarzem '%{changeset_comment}' + partial_changeset_with_comment_html: z komentarzem '%{changeset_comment}' partial_changeset_without_comment: bez komentarza details: 'Więcej informacji na temat zestawu zmian można znaleźć pod adresem: %{url}.' + details_html: 'Więcej informacji na temat zestawu zmian można znaleźć pod adresem: + %{url}.' unsubscribe: Aby wypisać się z subskrypcji dotyczącej tego zestawu zmian, odwiedź %{url} i kliknij „Nie obserwuj”. + unsubscribe_html: Aby wypisać się z subskrypcji dotyczącej tego zestawu zmian, + odwiedź %{url} i kliknij „Nie obserwuj”. messages: inbox: title: Wiadomości odebrane @@ -1706,6 +1720,24 @@ pl: as_unread: Wiadomość została oznaczona jako nieprzeczytana destroy: destroyed: Wiadomość usunięta + shared: + markdown_help: + title_html: Składnia kramdown + headings: Nagłówki + heading: Nagłówki + subheading: Podtytuł + unordered: Lista nieuporządkowana + ordered: Lista numerowana + first: Pierwszy element + second: Drugi element + link: Odnośnik + text: Tekst + image: Obraz + alt: Tekst alternatywny + url: Adres URL + richtext_field: + edit: Edytuj + preview: Podgląd site: about: next: Dalej @@ -1862,7 +1894,7 @@ pl: pytania dotyczące ich używania, prześlij swoje pytania do grupy roboczej ds. licencji. index: - js_1: Twoja przeglądarka internetowa nie obsługuje JavaScriptu, bądź też masz + js_1: Twoja przeglądarka internetowa nie obsługuje JavaScriptu bądź też masz wyłączoną jego obsługę. js_2: OpenStreetMap używa JavaScriptu do wyświetlania tej mapy. permalink: Permalink @@ -1880,17 +1912,6 @@ pl: user_page_link: stronie użytkownika anon_edits_html: (%{link}) anon_edits_link_text: Tu dowiesz się dlaczego. - flash_player_required_html: Aby korzystać z Potlatcha, edytora OpenStreetMap, - niezbędna jest wtyczka Flash. Możesz ściągnąć - odtwarzacz Flash z Adobe.com. Możesz również skorzystać z innych - dostępnych edytorów, aby edytować OpenStreetMap. - potlatch_unsaved_changes: Masz niezapisane zmiany. (Aby zapisać zmiany w Potlatchu, - kliknij przycisk „Zapisz”, bądź też, jeśli edytujesz w trybie „na żywo”, odznacz - aktualnie zaznaczony obiekt.) - potlatch2_not_configured: Potlatch 2 nie został skonfigurowany – aby uzyskać - więcej informacji, zobacz https://wiki.openstreetmap.org/wiki/The_Rails_Port - potlatch2_unsaved_changes: Nie zapisałeś zmian. (Jeśli chcesz zapisać zmiany - w Potlatch 2 powinieneś kliknąć przycisk „zapisz”.) id_not_configured: iD nie został skonfigurowany no_iframe_support: Używana przeglądarka nie obsługuje HTML iframes, które są niezbędne dla tej funkcji. @@ -1920,11 +1941,11 @@ pl: danych OpenStreetMap geofabrik: title: Pliki Geofabrik - description: Regularnie aktualizowane migawki kontynentów, państw i wybranych + description: Regularnie aktualizowane wyciągi z kontynentów, państw i wybranych miast metro: title: Metro Extracts - description: Migawki dużych miast i otaczających je obszarów + description: Wyciągi dla dużych miast i otaczających je obszarów other: title: Inne zasoby description: Dodatkowe zasoby wymienione w OpenStreetMap wiki @@ -2004,6 +2025,13 @@ pl: url: https://wiki.openstreetmap.org/wiki/Pl:Main_Page title: Wiki OpenStreetMap description: Zapoznaj się z wiki, aby uzyskać szczegółową dokumentację OpenStreetMap. + potlatch: + removed: Twój domyślny edytor OpenStreetMap to Potlatch. Ponieważ Adobe Flash + Player został wycofany, Potlatch nie jest już dostępny w przeglądarce. + desktop_html: Nadal można używać edytora Potlatch ściągając + aplikację pod Windows lub macOS. + id_html: Możesz także ustawić iD jako swój domyślny edytor w przeglądarce. Zmień swoje ustawienia tutaj. sidebar: search_results: Wyniki wyszukiwania close: Zamknij @@ -2025,7 +2053,7 @@ pl: trunk: Droga główna primary: Droga pierwszorzędna secondary: Droga drugorzędna - unclassified: Drogi niesklasyfikowane + unclassified: Droga czwartorzędna track: Droga polna lub leśna bridleway: Droga dla koni cycleway: Droga rowerowa @@ -2096,7 +2124,7 @@ pl: heading: Nagłówek subheading: Podtytuł unordered: Lista nieuporządkowana - ordered: Uporządkowana lista + ordered: Lista numerowana first: Pierwszy element second: Drugi element link: Odnośnik @@ -2119,7 +2147,7 @@ pl: ze źródeł objętych prawami autorskimi. Jeśli nie masz zgody, nie kopiuj z innych map (zarówno map papierowych, jak i online). basic_terms: - title: Podstawowe Zasady Mapowania + title: Podstawowe zasady mapowania paragraph_1_html: OpenStreetMap ma własny slang. Oto kilka słów, które ci się przydadzą. editor_html: Edytor to program lub strona, która pozwala @@ -2486,8 +2514,8 @@ pl: no_such_user: title: Nie znaleziono użytkownika heading: Użytkownik %{user} nie istnieje - body: Niestety nie znaleziono użytkownika o nazwie %{user}, sprawdź pisownię. Być - może skorzystano z nieprawidłowego odnośnika. + body: Niestety nie znaleziono użytkownika o nazwie %{user}. Sprawdź pisownię. + Być może skorzystano z nieprawidłowego odnośnika. deleted: '? (konto jest usunięte)' show: my diary: Dziennik @@ -3017,7 +3045,7 @@ pl: stay_roundabout_without_exit: Zostań na rondzie – %{name} start_without_exit: Zacznij na końcu %{name} destination_without_exit: Osiągnięto cel trasy - against_oneway_without_exit: Ruszaj na przeciwko jednostronnego ruchu na %{name} + against_oneway_without_exit: Ruszaj naprzeciwko jednostronnego ruchu na %{name} end_oneway_without_exit: Koniec jednostronnego ruchu na %{name} roundabout_with_exit: Na rondzie zjedź %{exit} zjazdem w %{name} roundabout_with_exit_ordinal: Na rondzie zjedź %{exit} zjazdem na %{name} @@ -3042,7 +3070,7 @@ pl: relation: Relacja nothing_found: Nie znaleziono obiektów error: 'Błąd komunikacji z %{server}: %{error}' - timeout: Przekroczono czas oczekiwania z:%{server} + timeout: Przekroczono czas oczekiwania z %{server} context: directions_from: Nawiguj stąd directions_to: Nawiguj tutaj diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 7bda477b4..c2d2a0d6d 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -221,18 +221,12 @@ pt-BR: with_name_html: '%{name} (%{id})' editor: default: Padrão (atualmente %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (editor no navegador) id: name: iD description: iD (editor no navegador web) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (editor no navegador web) remote: name: Controle Rrmoto - description: Controle remoto (JOSM ou Merkaartor) + description: Controle remoto (JOSM, Potlatch, Merkaartor) auth: providers: none: Nenhum @@ -452,13 +446,8 @@ pt-BR: new: title: Nova publicação no diário form: - subject: 'Assunto:' - body: 'Conteúdo:' - language: 'Idioma:' - location: 'Localização:' - latitude: 'Latitude:' - longitude: 'Longitude:' - use_map_link: usar mapa + location: Localização + use_map_link: Usar mapa index: title: Diários dos usuários title_friends: Diários dos amigos @@ -1302,12 +1291,15 @@ pt-BR: "yes": Via Aquática admin_levels: level2: Fronteira nacional + level3: Limite de região level4: Divisa Estadual level5: Limite Regional level6: Limite de Condado + level7: Limite do município level8: Limite Municipal level9: Limite de Distrito Municipal level10: Limite de Bairro + level11: Limite da vizinhança types: cities: Cidades Maiores towns: Cidades Menores @@ -1476,13 +1468,21 @@ pt-BR: hi: Olá %{to_user}, header: '%{from_user} comentou na publicação do diário do OpenStreetMap com o assunto %{subject}:' + header_html: '%{from_user} comentou na publicação do diário do OpenStreetMap + com o assunto %{subject}:' footer: Você pode ler o comentário em %{readurl}, pode comentá-lo em %{commenturl} ou respondê-lo em %{replyurl} + footer_html: Você pode ler o comentário em %{readurl}, pode comentá-lo em %{commenturl} + ou respondê-lo em %{replyurl} message_notification: - subject_header: '[OpenStreetMap] %{subject}' + subject: '[OpenStreetMap] %{message_title}' hi: Olá %{to_user}, header: '%{from_user} enviou uma mensagem pelo OpenStreetMap para você com o assunto %{subject}:' + header_html: '%{from_user} enviou uma mensagem pelo OpenStreetMap para você + com o assunto %{subject}:' + footer: Você pode também ler a mensagem em %{readurl} e você pode enviar uma + mensagem ao autor em %{replyurl} footer_html: Você pode também ler a mensagem em %{readurl} e você pode enviar uma mensagem ao autor em %{replyurl} friendship_notification: @@ -1490,7 +1490,9 @@ pt-BR: subject: '[OpenStreetMap] %{user} adicionou você como amigo(a)' had_added_you: '%{user} adicionou você como amigo(a) no OpenStreetMap.' see_their_profile: Você pode ver o perfil dele(a) em %{userurl}. + see_their_profile_html: Você pode ver o perfil dele(a) em %{userurl}. befriend_them: Você também pode adicioná-lo(a) como amigo em %{befriendurl}. + befriend_them_html: Você também pode adicioná-lo(a) como amigo em %{befriendurl}. gpx_description: description_with_tags_html: 'Parece seu arquivo GPX %{trace_name} com a descrição %{trace_description} e as seguintes etiquetas: %{tags}' @@ -1520,13 +1522,6 @@ pt-BR: para começar. email_confirm: subject: '[OpenStreetMap] Confirmação de endereço de e-mail' - email_confirm_plain: - greeting: Olá, - hopefully_you: Alguém (provavelmente você) quer alterar o seu endereço de e-mail - de %{server_url} para %{new_address}. - click_the_link: Se esta pessoa é você, por favor clique no link abaixo para - confirmar a alteração. - email_confirm_html: greeting: Olá, hopefully_you: Alguém (provavelmente você) quer alterar o seu endereço de e-mail de %{server_url} para %{new_address}. @@ -1534,13 +1529,6 @@ pt-BR: confirmar a alteração. lost_password: subject: '[OpenStreetMap] Solicitação de nova senha' - lost_password_plain: - greeting: Olá, - hopefully_you: Alguém (talvez você) pediu uma nova senha para a conta no openstreetmap.org - ligada a este e-mail. - click_the_link: Se esta pessoa é você, por favor clique no link abaixo para - receber uma nova senha. - lost_password_html: greeting: Olá, hopefully_you: Alguém (talvez você) pediu uma nova senha para a conta no openstreetmap.org ligada a este e-mail. @@ -1555,23 +1543,34 @@ pt-BR: a você' your_note: '%{commenter} deixou um comentário numa nota sua no mapa perto de %{place}.' + your_note_html: '%{commenter} deixou um comentário numa nota sua no mapa perto + de %{place}.' commented_note: '%{commenter} deixou um comentário numa nota de mapa que você comentou. A notá está perto de %{place}.' + commented_note_html: '%{commenter} deixou um comentário numa nota de mapa + que você comentou. A notá está perto de %{place}.' closed: subject_own: '[OpenStreetMap] %{commenter} resolveu uma nota sua' subject_other: '[OpenStreetMap] %{commenter} resolveu uma nota que interessa a você' your_note: '%{commenter} resolveu uma nota sua no mapa perto de %{place}.' + your_note_html: '%{commenter} resolveu uma nota sua no mapa perto de %{place}.' commented_note: '%{commenter} resolveu uma nota de um mapa que você comentou. A nota está perto de %{place}.' + commented_note_html: '%{commenter} resolveu uma nota de um mapa que você comentou. + A nota está perto de %{place}.' reopened: subject_own: '[OpenStreetMap] %{commenter} reativou uma nota sua' subject_other: '[OpenStreetMap] %{commenter} reativou uma nota que interessa a você' your_note: '%{commenter} reativou uma nota sua no mapa perto de %{place}.' + your_note_html: '%{commenter} reativou uma nota sua no mapa perto de %{place}.' commented_note: '%{commenter} reativou uma nota de mapa que você comentou. A nota está perto de %{place}.' + commented_note_html: '%{commenter} reativou uma nota de mapa que você comentou. + A nota está perto de %{place}.' details: Mais detalhes sobre a nota podem ser encontrados em %{url}. + details_html: Mais detalhes sobre a nota podem ser encontrados em %{url}. changeset_comment_notification: hi: Olá %{to_user}, greeting: Olá, @@ -1582,14 +1581,23 @@ pt-BR: que interessa a você' your_changeset: '%{commenter} deixou um comentário em %{time} em conjunto de alterações' + your_changeset_html: '%{commenter} deixou um comentário em %{time} em conjunto + de alterações' commented_changeset: '%{commenter} deixou um comentário a %{time} num conjunto de alterações em que está interessado, criado por %{changeset_author}' + commented_changeset_html: '%{commenter} deixou um comentário a %{time} num + conjunto de alterações em que está interessado, criado por %{changeset_author}' partial_changeset_with_comment: com comentário %{changeset_comment} + partial_changeset_with_comment_html: com comentário %{changeset_comment} partial_changeset_without_comment: sem comentários details: Mais detalhes sobre o conjunto de alterações podem ser encontrados em %{url} + details_html: Mais detalhes sobre o conjunto de alterações podem ser encontrados + em %{url} unsubscribe: Para cancelar a subscrição das atualizações deste conjunto de alterações, visite %{url} e clique em "Anular subscrição". + unsubscribe_html: Para cancelar a subscrição das atualizações deste conjunto + de alterações, visite %{url} e clique em "Anular subscrição". messages: inbox: title: Caixa de Entrada @@ -1665,6 +1673,24 @@ pt-BR: as_unread: Mensagem marcada como não lida destroy: destroyed: Mensagem apagada + shared: + markdown_help: + title_html: 'Linguagem de formatação: kramdown' + headings: Títulos + heading: Cabeçalho + subheading: Subtítulo + unordered: Lista não ordenada + ordered: Lista ordenada + first: Primeiro item + second: Segundo item + link: Link + text: Texto + image: Imagem + alt: Texto alternativo + url: URL + richtext_field: + edit: Editar + preview: Pré-visualizar site: about: next: Próximo @@ -1855,17 +1881,6 @@ pt-BR: user_page_link: página de usuário anon_edits_html: (%{link}) anon_edits_link_text: Descubra se é esse o seu caso. - flash_player_required_html: Necessita do Flash instalado e ativado para usar - o Potlatch, o editor em Flash do OpenStreetMap. Pode descarregar - o Flash do sítio Adobe.com. Também - estão disponíveis outras opções para editar o OpenStreetMap. - potlatch_unsaved_changes: Você tem alterações não salvas. (Para salvar no Potlatch, - você deve deselecionar a linha ou ponto atual se estiver editando ao vivo, - ou clicar em salvar se estiver editando offline. - potlatch2_not_configured: O Potlatch 2 não foi configurado - por favor veja - https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 para mais informações - potlatch2_unsaved_changes: Você tem alterações não salvas. (Para salvar no Potlatch - 2, você deve clicar em Salvar.) id_not_configured: iD não foi configurado no_iframe_support: Seu navegador não suporta iframes HTML, que são necessários para esse recurso. @@ -1979,6 +1994,15 @@ pt-BR: title: OpenStreetMap Wiki description: Navegue no wiki para ver a documentação do OpenStreetMap com mais detalhes. + potlatch: + removed: Seu editor padrão do OpenStreetMap é definido como Potlatch. Como o + Adobe Flash Player foi retirado, o Potlatch não está mais disponível para + uso em um navegador da web. + desktop_html: Você ainda pode usar o Potlatch por baixando + o aplicativo de desktop para Mac e Windows. + id_html: Alternativamente, você pode definir seu editor padrão para iD, que + é executado em seu navegador da Web como o Potlatch fazia anteriormente. Altere suas configurações de usuário aqui. sidebar: search_results: Resultados da busca close: Fechar diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml index 57a1daab6..d342c5b1c 100644 --- a/config/locales/pt-PT.yml +++ b/config/locales/pt-PT.yml @@ -206,15 +206,9 @@ pt-PT: other: há %{count} anos editor: default: Padrão (atualmente %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (editor no navegador) id: name: iD description: iD (editor no navegador) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (editor no navegador) remote: name: Controlo Remoto description: Controlo Remoto (JOSM ou Merkaartor) @@ -441,12 +435,7 @@ pt-PT: new: title: Criar nova publicação no diário form: - subject: 'Assunto:' - body: 'Texto:' - language: 'Idioma:' location: 'Localização:' - latitude: 'Latitude:' - longitude: 'Longitude:' use_map_link: usar mapa index: title: Diários dos Utilizadores @@ -1493,26 +1482,13 @@ pt-PT: para começares a editar. email_confirm: subject: '[OpenStreetMap] Confirma o teu endereço de e-mail' - email_confirm_plain: greeting: Olá, hopefully_you: Alguém (provavelmente tu) pediu para alterar o endereço de e-mail em %{server_url} para o endereço %{new_address}. click_the_link: Se foste tu a fazer o pedido, clica na ligação seguinte para confirmares o pedido. - email_confirm_html: - greeting: Olá, - hopefully_you: Alguém (esperamos que sejas tu) pretende alterar o endereço de - e-mail em %{server_url} para %{new_address}. - click_the_link: Se foste tu, clica na ligação seguinte para confirmares a alteração. lost_password: subject: '[OpenStreetMap] Pedido de nova palavra-passe' - lost_password_plain: - greeting: Olá, - hopefully_you: Alguém (provavelmente tu) pediu para definir uma nova palavra-passe - para a conta em openstreetmap.org associada a este e-mail. - click_the_link: Se foste tu, clica na ligação seguinte para criares uma nova - palavra-passe. - lost_password_html: greeting: Olá, hopefully_you: Alguém (provavelmente tu) pediu para definir uma nova palavra-passe para a conta em openstreetmap.org associada a este e-mail. @@ -1822,17 +1798,6 @@ pt-PT: user_page_link: página de utilizador anon_edits_html: (%{link}) anon_edits_link_text: Descobre a que se deve isto. - flash_player_required_html: Precisas do Flash Player instalado e ativado para - usar o Potlatch, o editor Flash do OpenStreetMap. Podes transferir - o Flash do sítio Adobe.com.
Também - há outras opções disponíveis para editares o OpenStreetMap. - potlatch_unsaved_changes: Tens alterações por gravar. (Para gravar no Potlatch, - deves desmarcar o ponto ou linha atual, se estiveres a editar no modo direto, - ou clicar no botão gravar se este estiver disponível.) - potlatch2_not_configured: O Potlatch 2 não foi configurado - por favor, consulta - https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 para mais informações - potlatch2_unsaved_changes: Tens alterações que não foram gravadas. (Para gravar - no Potlatch 2, deves clicar no botão Gravar.) id_not_configured: O editor iD não foi configurado no_iframe_support: O teu navegador de Internet não suporta iframes HTML, que são necessárias para esta funcionalidade. diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 761bf8cb0..945cf8997 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -186,15 +186,9 @@ ro: with_name_html: '%{name} (%{id})' editor: default: Implicit (în prezent %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (editor înglobat în navigator) id: name: iD description: iD (editor înglobat în navigator) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (editor înglobat în navigator) remote: name: Control la distanță description: Control de la distanță (JOSM sau Merkaartor) @@ -405,12 +399,7 @@ ro: new: title: O nouă înregistrare în jurnal form: - subject: 'Subiect:' - body: 'Corpul mesajului:' - language: 'Limbă:' location: 'Localizare:' - latitude: 'Latitudine:' - longitude: 'Longitudine:' use_map_link: utilizează harta index: title: Jurnalele utilizatorilor @@ -1377,27 +1366,13 @@ ro: pentru a începe. email_confirm: subject: '[OpenStreetMap] Confirmați adresa de e-mail' - email_confirm_plain: greeting: Salut, hopefully_you: Cineva (sperăm că tu) dorește să schimbe adresa de e-mail de la %{server_url} la %{new_address}. click_the_link: Dacă sunteți dumneavoastră, vă rugăm să faceți click pe linkul de mai jos pentru a confirma modificarea. - email_confirm_html: - greeting: Salut, - hopefully_you: Cineva (sperăm că tu) ar dori să schimbe adresa de e-mail la - %{server_url} la %{new_address}. - click_the_link: Dacă sunteți acesta, faceți click pe linkul de mai jos pentru - a confirma modificarea. lost_password: subject: '[OpenStreetMap] Solicitare de resetare a parolei' - lost_password_plain: - greeting: Salut, - hopefully_you: Cineva (posibil tu) a cerut resetarea parolei în contul openstreetmap.org - al acestei adrese de e-mail. - click_the_link: Dacă sunteți dumneavoastră, vă rugăm să faceți click pe linkul - de mai jos pentru a vă reseta parola. - lost_password_html: greeting: Salut, hopefully_you: Cineva (posibil tu) a cerut resetarea parolei în contul openstreetmap.org al acestei adrese de e-mail. @@ -1706,18 +1681,6 @@ ro: lucru. Puteți să vă setați editările ca public din %{user_page}. user_page_link: pagină de utilizator anon_edits_link_text: Aflați de ce este cazul. - flash_player_required_html: Aveți nevoie de un player Flash pentru a utiliza - Potlatch, editorul OpenStreetMap Flash. Puteți descarcă - Flash Player de la Adobe.com descărca Flash Player de la Adobe.com . - Sunt disponibile - Sunt disponibile și câteva alte opțiuni pentru editarea OpenStreetMap. - potlatch_unsaved_changes: Aveți modificări nesalvate. (Pentru a salva în Potlatch, - ar trebui să deselectați calea sau punctul curent, dacă editați în modul live - sau faceți clic pe Salvați dacă aveți un buton de salvare.) - potlatch2_not_configured: Potlatch 2 nu a fost configurat - consultați https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 - pentru mai multe informații - potlatch2_unsaved_changes: Aveți modificări nesalvate. (Pentru a salva în Potlatch - 2, ar trebui să faceți clic pe salvare.) id_not_configured: iD nu a fost configurat no_iframe_support: Browserul dvs. nu acceptă iframe HTML care sunt necesare pentru această caracteristică. diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 90e5dcd3b..55f47e2cd 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -41,6 +41,7 @@ # Author: Infovarius # Author: Irus # Author: Kaganer +# Author: Kareyac # Author: Katunchik # Author: Komzpa # Author: Link2xt @@ -54,6 +55,7 @@ # Author: Mike like0708 # Author: Mixaill # Author: Movses +# Author: MuratTheTurkish # Author: Nemo bis # Author: Nitch # Author: Nk88 @@ -168,6 +170,8 @@ ru: support_url: URL пользовательской поддержки allow_read_prefs: читать пользовательские настройки allow_write_prefs: изменять пользовательские настройки + allow_write_diary: создавать записи в дневнике, комментировать и заводить + друзей allow_write_api: редактировать карту allow_read_gpx: читать частные GPS-треки allow_write_gpx: загружать GPS-треки @@ -263,15 +267,9 @@ ru: other: '%{count} лет назад' editor: default: По умолчанию (назначен %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (редактор в браузере) id: name: iD description: iD (редактор в браузере) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (редактор в браузере) remote: name: Дистанционное управление description: Дистанционное управление (JOSM или Merkaartor) @@ -480,13 +478,8 @@ ru: new: title: Новая запись в дневнике form: - subject: 'Тема:' - body: 'Текст:' - language: 'Язык:' - location: 'Место:' - latitude: 'Широта:' - longitude: 'Долгота:' - use_map_link: Указать на карте + location: Местоположение + use_map_link: Использовать карту index: title: Дневники title_friends: Дневники друзей @@ -602,6 +595,7 @@ ru: runway: Взлётно-посадочная полоса taxiway: Рулёжная дорожка terminal: Терминал + windsock: Ветроуказатель amenity: animal_shelter: Приют для животных arts_centre: Центр искусств @@ -711,7 +705,7 @@ ru: viaduct: Виадук "yes": Мост building: - apartments: Многоквартирный дом + apartments: Квартиры bungalow: Бунгало cabin: Хижина chapel: Часовня @@ -738,7 +732,7 @@ ru: school: Здание школы shed: Сарай temple: Здание храма - terrace: Ряд жилых домов + terrace: Здание с террасой train_station: Железнодорожный вокзал university: Университет warehouse: Склад @@ -1401,32 +1395,18 @@ ru: дополнительной информации для начального ознакомления. email_confirm: subject: '[OpenStreetMap] Подтвердите ваш адрес электронной почты' - email_confirm_plain: greeting: Здравствуйте, hopefully_you: Кто-то (надеемся, что Вы) хочет изменить свой адрес электронной почты в %{server_url} на адрес %{new_address}. click_the_link: Если это вы, то перейдите по ссылке, расположенной ниже, чтобы подтвердить изменение. - email_confirm_html: - greeting: Здравствуйте, - hopefully_you: Кто-то (надеемся, что вы) хочет изменить свой адрес электронной - почты в %{server_url} на адрес %{new_address}. - click_the_link: Если это вы, то перейдите по ссылке, расположенной ниже, чтобы - подтвердить изменение. lost_password: subject: '[OpenStreetMap] Запрос на смену пароля' - lost_password_plain: greeting: Здравствуйте, hopefully_you: Кто-то (надеемся, что Вы) запросил смену пароля для этого адреса электронной почты, зарегистрированного на openstreetmap.org. click_the_link: Если это вы, пожалуйста, перейдите по ссылке, указанной ниже, чтобы сменить ваш пароль. - lost_password_html: - greeting: Здравствуйте, - hopefully_you: Кто-то (надеемся, что вы) запросил смену пароля для этого адреса - электронной почты, зарегистрированного на openstreetmap.org. - click_the_link: Если это вы, пожалуйста, перейдите по ссылке, указанной ниже, - чтобы сменить ваш пароль. note_comment_notification: anonymous: анонимный участник greeting: Здравствуйте, @@ -1557,6 +1537,17 @@ ru: as_unread: Сообщение отмечено как непрочитанное destroy: destroyed: Сообщение удалено + shared: + markdown_help: + subheading: Подзаголовок + link: Ссылка + text: Текст + image: Изображение + alt: Альтернативный текст + url: URL + richtext_field: + edit: Править + preview: Предпросмотр site: about: next: Далее @@ -1728,17 +1719,6 @@ ru: user_page_link: страница пользователя anon_edits_html: '%{link}' anon_edits_link_text: Выяснить, в чём дело. - flash_player_required_html: Для использования редактора Potlatch необходим Flash-плеер. - Вы можете загрузить - Flash-плеер с Adobe.com. Существуют и другие - способы редактирования OpenStreetMap. - potlatch_unsaved_changes: Имеются несохранённые изменения. (Для сохранения в - Potlatch снимите выделение с пути или точки, если редактируете в «живом» режиме, - либо нажмите кнопку «сохранить», если вы в режиме отложенного сохранения.) - potlatch2_not_configured: Potlatch 2 не был настроен — пожалуйста, обратитесь - к https://wiki.openstreetmap.org/wiki/The_Rails_Port за дополнительной информацией - potlatch2_unsaved_changes: Имеются несохранённые изменения. (Для сохранения - в Potlatch 2 следует нажать «Сохранить».) id_not_configured: iD не был настроен no_iframe_support: Ваш браузер не поддерживает рамки в HTML, а они нужны для этого режима. diff --git a/config/locales/sc.yml b/config/locales/sc.yml index 7122ee8bb..8f167edfb 100644 --- a/config/locales/sc.yml +++ b/config/locales/sc.yml @@ -106,9 +106,6 @@ sc: iD description: iD (acontzadore in lìnia) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (acontzadore in lìnia) remote: name: Controllu Remotu description: Controllu Remotu (JOSM o Merkaartor) @@ -196,12 +193,7 @@ sc: comment: Cummentu diary_entries: form: - subject: 'Ogetu:' - body: 'Corpus:' - language: 'Limba:' location: 'Logu:' - latitude: 'Latitùdine:' - longitude: 'Longitùdine:' show: leave_a_comment: Lassa unu cummentu login: Intra @@ -747,17 +739,10 @@ sc: la cunfirmare:' email_confirm: subject: '[OpenStreetMap] Cunfirma s''indiritzu de posta' - email_confirm_plain: - greeting: Salude, - hopefully_you: Calicunu (isperamus tue matessi) cheret cambiare s'indiritzu - eletrònicu tuo dae %{server_url} cun %{new_address}. - email_confirm_html: greeting: Salude, hopefully_you: Calicunu (isperamus tue matessi) cheret cambiare s'indiritzu eletrònicu tuo dae %{server_url} cun %{new_address}. - lost_password_plain: - greeting: Salude, - lost_password_html: + lost_password: greeting: Salude, note_comment_notification: greeting: Salude, diff --git a/config/locales/scn.yml b/config/locales/scn.yml index b8e91eae7..f22c06715 100644 --- a/config/locales/scn.yml +++ b/config/locales/scn.yml @@ -111,15 +111,9 @@ scn: tagstring: spartuti câ vìrgula editor: default: Pridifinutu (com'a ora %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (editor ntô browser) id: name: iD description: iD (editor ntô browser) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (editor ntô browser) remote: name: Telecumannu description: Telecumannu (JOSM o Merkaartor) @@ -313,12 +307,7 @@ scn: new: title: Vuci nova dû diariu form: - subject: 'Oggettu:' - body: 'Corpu:' - language: 'Lingua:' location: 'Locu:' - latitude: 'Latitùdini:' - longitude: 'Luncitùdini:' use_map_link: adòpira la cartina index: title: Diarî di l'utenti @@ -981,13 +970,6 @@ scn: pi spigàriti comu s'accumenza. email_confirm: subject: '[OpenStreetMap] Cunferma lu tò nnirizzu di posta elittrònica' - email_confirm_plain: - greeting: Salutamu, - hopefully_you: Quarchidunu (spiramu chi fusti tu) vurrìa canciari lu sò nnirizzu - di posta elittrònica nta %{server_url} mittennu comu nnirizzu novu %{new_address}. - click_the_link: Si fusti tu, pi favuri clicca lu culligamentu ccassutta pi cunfirmari - stu canciamentu. - email_confirm_html: greeting: Salutamu, hopefully_you: Quarchidunu (spiramu chi fusti tu) vurrìa canciari lu sò nnirizzu di posta elittrònica nta %{server_url} mittennu comu nnirizzu novu %{new_address}. @@ -995,18 +977,11 @@ scn: stu canciamentu. lost_password: subject: '[OpenStreetMap] Addumannata d''azziramentu dâ palora d''òrdini' - lost_password_plain: greeting: Salutamu, hopefully_you: Quarchidunu (spiramu chi fusti tu) addumannau d'azzirari la palora d'òrdini dû cuntu d'openstreetmap.org assuciatu a stu nnirizzu di posta elittrònica. click_the_link: Si fusti tu, pi favuri clicca lu culligamentu ccassutta p'azzirari la tò palora d'òrdini. - lost_password_html: - greeting: Salutamu, - hopefully_you: Quarchidunu (spiramu chi fusti tu) addumannau d'azzirari la palora - d'òrdini dû cuntu d'openstreetmap.org assuciatu a stu nnirizzu di posta elittrònica. - click_the_link: Si fusti tu, pi favuri clicca lu culligamentu ccà sutta p'azzirari - la tò palora d'òrdini. note_comment_notification: anonymous: N’utenti anònimu greeting: Salutamu, @@ -1290,17 +1265,6 @@ scn: nun lu fai. Poi mpustari li tò canciamenti comu pùbblici dâ tò %{user_page}. user_page_link: pàggina di l'utenti anon_edits_link_text: Ti spigamu pirchì. - flash_player_required_html: T'abbisogna lu Flash player p'adupirari Potlatch, - lu prugramma pi canciari OpenStreetMap fattu cû Flash. Poi scarricari - lu Flash Player d'Adobe.com. Ci - sunnu macari àutri altirnativi pi fari canciamenti nta OpenStreetMap. - potlatch_unsaved_changes: Hai canciamenti nun sarvati. (Pi sarvari nta Potlatch, - avissi a disilizziunari lu caminu o lu puntu currenti, si stai facennu canciamenti - ntâ mudalità diretta, o si l'hai, carcari lu buttuni «sarva».) - potlatch2_not_configured: Potlatch 2 fu cunfiguratu - pi favuri talìa http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 - p'aviri nfurmazzioni - potlatch2_unsaved_changes: Hai canciamenti nun sarvati. (Pi sarvari nta Potlach - 2, hai a carcari «sarva».) id_not_configured: iD nun fu cunfiguratu no_iframe_support: Lu tò browser nun supporta l'iframe di l'HTML, chi sunnu nicissarî pi sta funziunalità. diff --git a/config/locales/sco.yml b/config/locales/sco.yml index 5f4394413..560bc18c0 100644 --- a/config/locales/sco.yml +++ b/config/locales/sco.yml @@ -84,15 +84,9 @@ sco: pass_crypt: Passwird editor: default: Default (currently %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (in-brouser eeditor) id: name: iD description: iD (in-brouser eeditor) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (in-brouser eeditor) remote: name: Remote Control description: Remote Control (JOSM or Merkaartor) @@ -251,12 +245,7 @@ sco: new: title: New Diary Entry form: - subject: 'Subject:' - body: 'Body:' - language: 'Leid:' location: 'Location:' - latitude: 'Latitude:' - longitude: 'Longitude:' use_map_link: uise map index: title: Uisers' diaries @@ -831,15 +820,10 @@ sco: learn_more: Learn Mair more: Mair user_mailer: - lost_password_plain: + lost_password: hopefully_you: Someane (possibly ye) haes asked for the passwird tae be reset on this email address's openstreetmap.org accoont. click_the_link: If this is ye, please click the airtin ablo tae reset yer passwird. - lost_password_html: - greeting: Hi, - hopefully_you: Someane (possibly ye) has asked for the passwird tae be reset - on this email address's openstreetmap.org accoont. - click_the_link: If this is ye, please click the airtin ablo tae reset yer passwird. note_comment_notification: anonymous: An anonymous uiser greeting: Hi, diff --git a/config/locales/sk.yml b/config/locales/sk.yml index c1d58788e..4e7a0966e 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -138,15 +138,9 @@ sk: half_a_minute: pred pol minútou editor: default: Predvolený (v súčasnosti %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (editor v prehliadači) id: name: iD description: iD (editor v prehliadači) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (editor v prehliadači) remote: name: Diaľkové ovládanie description: Diaľkové ovládanie (JOSM alebo Merkaartor) @@ -318,12 +312,7 @@ sk: new: title: Nový záznam denníka form: - subject: 'Predmet:' - body: 'Text:' - language: 'Jazyk:' location: 'Poloha:' - latitude: 'Zemepisná šírka:' - longitude: 'Zemepisná dĺžka:' use_map_link: použiÅ¥ mapu index: title: Denníky používateľov @@ -1107,32 +1096,18 @@ sk: ktoré vám pomôžu začaÅ¥. email_confirm: subject: '[OpenStreetMap] Potvrďte svoju e-mailovú adresu' - email_confirm_plain: greeting: Ahoj, hopefully_you: Niekto (snáď vy) požiadal o zmenu e-mailovej adresy na serveri %{server_url} na %{new_address}. click_the_link: Ak ste to boli vy, potvrďte prosím zmenu kliknutím na nasledovný odkaz. - email_confirm_html: - greeting: Ahoj, - hopefully_you: Niekto (dúfame, že vy) požiadal o zmenu e-mailovej adresy na - serveri %{server_url} na %{new_address}. - click_the_link: Ak ste to vy, kliknite prosím na nižšie uvedený odkaz pre potvrdenie - zmeny. lost_password: subject: '[OpenStreetMap] ŽiadosÅ¥ o reset hesla' - lost_password_plain: greeting: Ahoj, hopefully_you: Niekto (snáď vy) požiadal o vygenerovanie nového hesla pre používateľa serveru openstreetmap.org s touto e-mailovou adresou. click_the_link: Ak ste to vy, kliknite prosím na odkaz nižšie pre obnovenie svojho hesla. - lost_password_html: - greeting: Ahoj, - hopefully_you: Niekto (možno vy) požiadal, o reset hesla na tejto emailovej - adrese openstreetmap.org účtu. - click_the_link: Ak ste to vy, kliknite prosím na nižšie uvedený odkaz pre obnovenie - vášho hesla. note_comment_notification: anonymous: Anonymný používateľ greeting: Ahoj, @@ -1325,17 +1300,6 @@ sk: Svoje úpravy môžete nastaviÅ¥ ako verejné na vaÅ¡ej %{user_page}. user_page_link: stránke používateľa anon_edits_link_text: Prečo to tak je? - flash_player_required_html: Ak chcete používaÅ¥ Potlatch, flashový editor OpenStreetMap, - potrebujete Flash prehrávač. Môžete si stiahnuÅ¥ - Flash Player z Adobe.com. Pre editáciu OpenStreetMap existuje viacero - ďalších možností. - potlatch_unsaved_changes: Nemáte uložené zmeny. (V Potlatchu odznačte aktuálnu - cestu alebo bod ak editujete v živom režime, alebo kliknite na tlačítko UložiÅ¥ - (Save) vľavo hore, ak sa tam zobrazuje.) - potlatch2_not_configured: Potlatch 2 nie je nakonfigurovaný – podrobnejÅ¡ie informácie - nájdete na http://wiki.openstreetmap.org/wiki/The_Rails_Port - potlatch2_unsaved_changes: Nemáte uložené zmeny. (V Potlatch 2 sa zmeny ukladajú - kliknutím na tlačítko Save/UložiÅ¥ vľavo hore.) id_not_configured: iD zatiaľ nie je nakonfigurovaný no_iframe_support: Váš prehliadač nepodporuje vložené HTML rámy (iframes), ktoré sú pre túto funkciu nevyhnutné. diff --git a/config/locales/sl.yml b/config/locales/sl.yml index f603002e1..a2689757c 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -138,15 +138,9 @@ sl: with_version: '%{id}, %{version}. različica' editor: default: Privzet (trenutno %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (v brskalniku) id: name: iD description: iD (urejevalnik v brskalniku) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (urejevalnik v brskalniku) remote: name: Zunanji urejevalnik description: Zunanji urejevalnik (JOSM ali Merkaartor) @@ -353,12 +347,7 @@ sl: new: title: Nov zapis v dnevnik uporabnikov form: - subject: 'Zadeva:' - body: 'Besedilo:' - language: 'Jezik:' location: 'Lokacija:' - latitude: 'Z. Å¡irina:' - longitude: 'Z. dolžina:' use_map_link: uporabi zemljevid index: title: Dnevniki uporabnikov @@ -1140,32 +1129,18 @@ sl: informacij. email_confirm: subject: '[OpenStreetMap] Potrdite svoj elektronski naslov' - email_confirm_plain: greeting: Pozdravljeni, hopefully_you: Nekdo (upamo, da ste to vi) je zahteval spremembo svojega e-poÅ¡tnega naslova v %{server_url} na %{new_address}. click_the_link: Če ste to vi, vas prosimo, da kliknete na spodnjo povezavo za potrditev spremembe. - email_confirm_html: - greeting: Pozdravljeni, - hopefully_you: Nekdo (upamo, da vi) je zahteval spremembo svojega e-poÅ¡tnega - naslova v %{server_url} na %{new_address}. - click_the_link: Če ste to vi, vas prosimo, da kliknete na spodnjo povezavo za - potrditev spremembe. lost_password: subject: '[OpenStreetMap] Zahteva za ponastavitev gesla' - lost_password_plain: greeting: Pozdravljeni, hopefully_you: Nekdo (verjetno vi) je zahteval ponastavitev gesla uporabniÅ¡kega računa openstreetmap.org s tem e-poÅ¡tnim naslovom. click_the_link: Če ste to vi, vas prosimo, da kliknete na spodnjo povezavo za ponastavitev gesla. - lost_password_html: - greeting: Pozdravljeni, - hopefully_you: Nekdo (upamo, da vi) je zahteval ponastavitev gesla openstreetmap.org - uporabniÅ¡kega računa s tem naslovom e-poÅ¡te. - click_the_link: Če ste to vi, vas prosimo, da kliknete na spodnjo povezavo za - ponastavitev gesla. note_comment_notification: anonymous: Brezimni uporabnik greeting: Živjo, @@ -1350,16 +1325,6 @@ sl: niso javni. Označite jih lahko kot javne na %{user_page}. user_page_link: strani vaÅ¡ega uporabniÅ¡kega računa anon_edits_link_text: Pojasnilo zakaj je temu tako. - flash_player_required_html: Za uporabo Potlatcha, urejevalnika OpenStreetMap, - potrebujete predvajalnik Flash. Prenesete ga lahko s strani Adobe.com. - Na razpolago so tudi druge - možnosti za urejanje zemljevidov OpenStreetMap. - potlatch_unsaved_changes: Imate neshranjene spremembe. (Za shranjevanje v Potlatch-u, - od-izberite trenutno pot ali vozlišče (v načinu v živo), ali pa kliknite na - gumb Save (shrani), če ga imate.) - potlatch2_not_configured: Potlatch 2 ni nastavljen - poglej https://wiki.openstreetmap.org/wiki/The_Rails_Port - potlatch2_unsaved_changes: Spremembe niso shranjene. (Če želite shraniti v Potlatch - 2, kliknete Shrani.) id_not_configured: iD Å¡e ni bil konfiguriran no_iframe_support: VaÅ¡ brskalnik ne podpira HTML iframes, kar je potrebno za to funkcijo. diff --git a/config/locales/sq.yml b/config/locales/sq.yml index 0c87227d9..70aa6c9d0 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -115,15 +115,9 @@ sq: with_version: '%{id}, v%{version}' editor: default: E parazgjedhur (aktualisht %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (redaktorin e shfletuesit) id: name: iD description: iD (në redaktorin e shfletuesit) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (në redaktorin e shfletuesit) remote: name: Kontrollë nga larg description: Kontrollë nga larg (JOSM apo Merkaartor) @@ -300,12 +294,7 @@ sq: new: title: Shënim i ri në ditar form: - subject: 'Titulli:' - body: 'Trupi i mesazhit:' - language: 'Gjuha:' location: 'Lokacioni:' - latitude: 'Gjerësia gjeografike:' - longitude: 'Gjatësia gjeografike:' use_map_link: përdor hartën index: title: Ditarët e përdoruesve @@ -948,7 +937,6 @@ sq: diary_comment_notification: hi: Përshëndetje %{to_user}, message_notification: - subject_header: '[OpenStreetMap] %{subject}' hi: Përshëndetje %{to_user}, gpx_failure: import_failures_url: http://wiki.openstreetmap.org/wiki/GPX_Import_Failures @@ -957,15 +945,8 @@ sq: greeting: Tungjatjeta! email_confirm: subject: '[OpenStreetMap] Konfirmo adresën e emailit tënd' - email_confirm_plain: greeting: Përshëndetje, - email_confirm_html: - greeting: Përshëndetje, - click_the_link: Nëse ky je ti, të lutem kliko në lidhjen e mëposhtme për të - konfirmuar ndryshimin. - lost_password_plain: - greeting: Përshëndetje, - lost_password_html: + lost_password: greeting: Përshëndetje, note_comment_notification: greeting: Përshëndetje, @@ -1105,10 +1086,6 @@ sq: edit: user_page_link: '{{GENDER:{{ROOTPAGENAME}}|faqja e përdoruesit|faqja e përdorueses}}' anon_edits_html: (%{link}) - flash_player_required_html: Ti duhet të kesh 'Flash Player' për ta përdorur - 'Potlatch', redaktorin e 'OpenStreetMap Flash'. Ti mund ta shkarkosh Flash - Player nga Adobe.com. Disa - mënyra të tjeratë për ta redaktuar OpenStreetMap, gjithashtu janë të mundshme. export: title: Eksporto area_to_export: Zona për tu eksportuar diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index 4b23a2785..5933f32aa 100644 --- a/config/locales/sr-Latn.yml +++ b/config/locales/sr-Latn.yml @@ -114,12 +114,6 @@ sr-Latn: with_version: '%{id}, ver. %{version}' editor: default: Podrazumevano (trenutno %{name}) - potlatch: - name: Potlač 1 - description: Potlač 1 (uređivač u pregledaču) - potlatch2: - name: Potlač 2 - description: Potlač 2 (uređivač u pregledaču) remote: name: Daljinsko upravljanje description: Daljinsko upravljanje (JOSM ili Merkaartor) @@ -198,12 +192,7 @@ sr-Latn: new: title: Novi unos u dnevniku form: - subject: 'Tema:' - body: 'Tekst:' - language: 'Jezik:' location: 'Lokacija:' - latitude: 'Geografska Å¡irina:' - longitude: 'Geografska dužina:' use_map_link: koristi mapu index: title: Korisnički dnevnici @@ -761,7 +750,6 @@ sr-Latn: footer: Možete pročitati komentare na %{readurl}, prokomentarisati na %{commenturl} ili odgovoriti na %{replyurl} message_notification: - subject_header: '[Openstritmap] – %{subject}' hi: Pozdrav, %{to_user}, header: '%{from_user} vam posla poruku preko Openstritmapa pod naslovom %{subject}:' friendship_notification: @@ -781,24 +769,12 @@ sr-Latn: subject: '[OpenStreetMap] Potvrdite vaÅ¡u e-adresu' email_confirm: subject: '[OpenStreetMap] Potvrdite vaÅ¡u e-adresu' - email_confirm_plain: - greeting: Pozdrav, - click_the_link: Ako ste to vi, kliknite na vezu ispod da biste potvrdili izmene. - email_confirm_html: greeting: Pozdrav, - hopefully_you: Neko (verovatno vi) želeo bi da promeni e-adresu sa %{server_url} - na %{new_address}. click_the_link: Ako ste to vi, kliknite na vezu ispod da biste potvrdili izmene. lost_password: subject: '[OpenStreetMap] Zahtev za poniÅ¡tavanje lozinke' - lost_password_plain: greeting: Pozdrav, click_the_link: Ako ste to vi, kliknite na vezu ispod da biste poniÅ¡tili lozinku. - lost_password_html: - greeting: Pozdrav, - hopefully_you: Neko (verovatno vi) zatražio je poniÅ¡tavanje lozinke za ovaj - nalog. - click_the_link: Ako ste to vi, kliknite na vezu ispod da biste poniÅ¡tili lozinku. messages: inbox: title: Primljene @@ -986,15 +962,6 @@ sr-Latn: user_page_link: korisničke stranice anon_edits_html: (%{link}) anon_edits_link_text: Saznajte zaÅ¡to je to slučaj. - flash_player_required_html: Potreban vam je fleÅ¡ plejer da biste koristili uređivač - mapa. Preuzmite ga odavde. - Dostupne su i neke druge - mogućnosti za uređivanje Openstritmapa. - potlatch_unsaved_changes: Niste sačuvali izmene. Da biste to uradili, poniÅ¡tite - tekuću putanju ili tačku, ako uređujete naživo, ili kliknite na dugme za čuvanje. - potlatch2_not_configured: Potlač 2 nije podeÅ¡en. Pogledajte http://wiki.openstreetmap.org/wiki/The_Rails_Port - potlatch2_unsaved_changes: Niste sačuvali izmene. Da biste to uradili, kliknite - na dugme za čuvanje. no_iframe_support: VaÅ¡ pregledač ne podržava HTML iframes, a oni su potrebni za ovu mogućnost. export: diff --git a/config/locales/sr.yml b/config/locales/sr.yml index ae7ace552..e15becc58 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -144,15 +144,9 @@ sr: with_version: '%{id}, вер. %{version}' editor: default: Подразумевано (тренутно %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (уређивач у прегледачу) id: name: iD description: iD (уређивач у прегледачу) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (уређивач у прегледачу) remote: name: Даљинско управљање description: Даљинско управљање (JOSM или Merkaartor) @@ -352,12 +346,7 @@ sr: new: title: Нови унос у дневнику form: - subject: 'Тема:' - body: 'Тело:' - language: 'Језик:' location: 'Локација:' - latitude: 'Географска ширина:' - longitude: 'Географска дужина:' use_map_link: користи мапу index: title: Кориснички дневници @@ -1126,7 +1115,6 @@ sr: footer: Можете прочитати коментаре на %{readurl}, прокоментарисати на %{commenturl} или одговорити на %{replyurl} message_notification: - subject_header: '[Опенстритмап] – %{subject}' hi: Поздрав, %{to_user}, header: '%{from_user} вам посла поруку преко Опенстритмапа под насловом %{subject}:' footer_html: Такође можете да прочитате поруку на %{readurl} и можете да одговорите @@ -1156,27 +1144,16 @@ sr: о томе како почети. email_confirm: subject: '[OpenStreetMap] Потврдите Вашу имејл адресу' - email_confirm_plain: greeting: Поздрав, hopefully_you: Неко (вероватно ви) желео би да промени имејл адресу са %{server_url} на %{new_address}. click_the_link: Ако сте то ви, кликните на везу испод да бисте потврдили измене. - email_confirm_html: - greeting: Поздрав, - hopefully_you: Неко (вероватно Ви) желео би да промени имејл адресу са %{server_url} - на %{new_address}. - click_the_link: Ако сте то ви, кликните на везу испод да бисте потврдили измене. lost_password: subject: '[OpenStreetMap] Захтев за поништавање лозинке' - lost_password_plain: greeting: Поздрав, hopefully_you: Неко (вероватно ви) затражио је поништавање лозинке за имејл адресу овог openstreetmap.org налога. click_the_link: Ако си то ти, кликни на везу испод да поништиш лозинку. - lost_password_html: - greeting: Поздрав, - hopefully_you: Неко (вероватно ви) затражио је поништавање лозинке за овај налог. - click_the_link: Ако сте то ви, кликните на везу испод да бисте поништили лозинку. note_comment_notification: anonymous: Анонимни корисник greeting: Поздрав, @@ -1480,17 +1457,6 @@ sr: user_page_link: корисничке странице anon_edits_html: (%{link}) anon_edits_link_text: Сазнајте зашто је то случај. - flash_player_required_html: Потребан вам је Flash Player да бисте користили - Potlatch, OpenStreetMap Flash уређивач. Можете да преузмете - Flash Player са веб-сајта Adobe.com. Неколико - других опција су такође доступне за уређивање OpenStreetMap-а. - potlatch_unsaved_changes: Имате несачуване измене. (Да бисте их сачували у Potlatch-у, - демаркирајте тренутни пут или тачку, ако уређујете у „живом“ режиму, или кликните - на дугме за чување, ако постоји.) - potlatch2_not_configured: Потлач 2 није конфигурисан — погледајте https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 - за више информација - potlatch2_unsaved_changes: Нисте сачували измене. Да бисте то урадили, кликните - на дугме за чување. id_not_configured: iD није конфигурисан no_iframe_support: Ваш прегледач не подржава HTML iframes, а они су потребни за ову могућност. diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 6a1dbf660..932c61e9b 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -219,15 +219,9 @@ sv: with_name_html: '%{name} (%{id})' editor: default: Standard (för närvarande %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (webbläsarredigerare) id: name: iD description: iD (webbläsarredigeraren) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (webbläsarredigerare) remote: name: Fjärrstyrning description: Fjärrstyrning (JOSM eller Merkaartor) @@ -453,13 +447,8 @@ sv: new: title: Nytt dagboksinlägg form: - subject: 'Ämne:' - body: 'Brödtext:' - language: 'SprÃ¥k:' - location: 'Plats:' - latitude: 'Latitud:' - longitude: 'Longitud:' - use_map_link: använd karta + location: Plats + use_map_link: Använd karta index: title: Användardagböcker title_friends: Vänners dagböcker @@ -1381,7 +1370,7 @@ sv: footer: Du kan ocksÃ¥ läsa kommentaren pÃ¥ %{readurl} och du kan kommentera pÃ¥ %{commenturl} eller skicka ett meddelande till författaren pÃ¥ %{replyurl} message_notification: - subject_header: '[OpenStreetMap] %{subject}' + subject: '[OpenStreetMap] %{message_title}' hi: Hej %{to_user}, header: '%{from_user} har skickat ett meddelande via OpenStreetMap med ämnet %{subject}:' @@ -1419,30 +1408,17 @@ sv: om hur du kommer igÃ¥ng. email_confirm: subject: '[OpenStreetMap] Bekräfta din e-postadress' - email_confirm_plain: greeting: Hej, hopefully_you: NÃ¥gon (förhoppningsvis du själv) vill ändra sin e-postadress pÃ¥ %{server_url} till %{new_address}. click_the_link: Om det är du, klicka pÃ¥ länken nedan för att bekräfta ändringen. - email_confirm_html: - greeting: Hej, - hopefully_you: NÃ¥gon (förhoppningsvis du) vill ändra sin e-postadress pÃ¥ %{server_url} - till %{new_address}. - click_the_link: Om det är du, klicka pÃ¥ länken nedan för att bekräfta förändringen. lost_password: subject: '[OpenStreetMap] Begäran om Ã¥terställning av lösenord' - lost_password_plain: greeting: Hej, hopefully_you: NÃ¥gon (kanske du själv) har begärt Ã¥terställning av lösenordet pÃ¥ denna e-postadress opeenstreetmap.org-konto. click_the_link: Om det är du, klicka pÃ¥ länken nedan för att Ã¥terställa ditt lösenord. - lost_password_html: - greeting: Hej, - hopefully_you: NÃ¥gon (kanske du själv) har begärt Ã¥terställning av lösenordet - pÃ¥ denna e-postadress opeenstreetmap.org-konto. - click_the_link: Om detta är du, klicka pÃ¥ länken nedan för att Ã¥terställa ditt - lösenord. note_comment_notification: anonymous: En anonym användare greeting: Hej, @@ -1480,6 +1456,8 @@ sv: du är intresserad av' your_changeset: '%{commenter} har lämnat en kommentar pÃ¥ ett av dina ändringsmängder 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 pÃ¥ en karta du bevakar, skapad av %{changeset_author} %{time}' partial_changeset_with_comment: med kommentar '%{changeset_comment}' @@ -1562,6 +1540,24 @@ sv: as_unread: Meddelandet markerat som oläst destroy: destroyed: Meddelande raderat + shared: + markdown_help: + title_html: Tolkat med kramdown + headings: Rubriker + heading: Rubrik + subheading: Underrubrik + unordered: Osorterad lista + ordered: Sorterad lista + first: Första objektet + second: Andra objektet + link: Länk + text: Text + image: Bild + alt: Alt-text + url: Webbadress + richtext_field: + edit: Redigera + preview: Förhandsgranska site: about: next: Nästa @@ -1752,16 +1748,6 @@ sv: user_page_link: användarsida anon_edits_html: (%{link}) anon_edits_link_text: Ta reda pÃ¥ varför det är sÃ¥. - flash_player_required_html: Du mÃ¥ste ha Flash Player för att kunna använda Potlatch, - OpenStreetMaps flasheditor. Du kan ladda - hem Flash Player frÃ¥n Adobe.com. Det finns ocksÃ¥ flera - andra redigerare tillgängliga för OpenStreetMap. - potlatch_unsaved_changes: Du har osparade ändringar. (För att spara i Potlatch, - bör du avmarkera den nuvarande vägen eller markeringen om du redigerar i realtidsläge, - eller klicka pÃ¥ Spara om du har en Spara-knapp.) - potlatch2_not_configured: Potlatch 2 har inte konfigurerats - se https://wiki.openstreetmap.org/wiki/The_Rails_Port - potlatch2_unsaved_changes: Du har osparade ändringar. (För att spara i Potlatch - 2, bör du klicka pÃ¥ spara.) id_not_configured: iD har inte konfigurerats no_iframe_support: Din webbläsare stöder inte HTML iframes, vilken är nödvändig för den här funktionen. diff --git a/config/locales/ta.yml b/config/locales/ta.yml index e523c5072..bfc47c2a4 100644 --- a/config/locales/ta.yml +++ b/config/locales/ta.yml @@ -107,12 +107,6 @@ ta: tagstring: காற்புள்ளி வரம்பில்லை editor: default: இயல்புநிலை (தற்போதைய %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (உலவியினுள்ளேயே அமைந்த தொகுப்பி) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (உலவியினுள்ளேயே அமைந்த தொகுப்பி) remote: name: தொலைவுக் கட்டுப்பாடு description: தொலைவு கட்டுப்பாடு (JOSM அல்லது Merkaartor) @@ -196,13 +190,8 @@ ta: new: title: புதிய டைரி உள்ளீடு form: - subject: 'பொருள்:' - body: 'உரை:' - language: 'மொழி:' - location: 'இடம்:' - latitude: 'அட்சரேகை:' - longitude: 'தீர்க்கரேகை:' - use_map_link: வரைப்படத்தை பயன்படுத்தவும் + location: இடம் + use_map_link: வரைபடத்தைப் பயன்படுத்தவும் index: title: பயனரின் நாட்குறிப்பேடுகள் title_friends: நண்பர்களின் நாட்குறிப்பேடுகள் @@ -525,13 +514,9 @@ ta: learn_more: மேலும் அறிய more: மேலும் user_mailer: - email_confirm_plain: - greeting: வணக்கம், - email_confirm_html: - greeting: வணக்கம், - lost_password_plain: + email_confirm: greeting: வணக்கம், - lost_password_html: + lost_password: greeting: வணக்கம், changeset_comment_notification: greeting: வணக்கம், @@ -576,6 +561,13 @@ ta: destroy_button: நீக்கு destroy: destroyed: தகவல் நீக்கப்பட்டது + shared: + markdown_help: + heading: தலைப்பு + text: உரை + image: படம் + richtext_field: + edit: தொகு site: about: next: அடுத்தது diff --git a/config/locales/te.yml b/config/locales/te.yml index 7c593a088..798c4a7c4 100644 --- a/config/locales/te.yml +++ b/config/locales/te.yml @@ -23,7 +23,7 @@ te: message: create: పంపించు client_application: - update: మార్చు + update: తాజాకరించు trace: create: ఎక్కించు update: మార్పులను భద్రపరచు @@ -64,7 +64,7 @@ te: trace: user: వాడుకరి visible: చూడదగిన - name: పేరు + name: దస్త్రపు పేరు size: పరిమాణం latitude: అక్షాంశం longitude: రేఖాంశం @@ -95,12 +95,12 @@ te: 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} కిందట, %{user} చే మూసివేయబడింది + 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}, %{user} చే మూసివేయబడింది version: సంచిక anonymous: అజ్ఞాత no_comment: (వ్యాఖ్య లేదు) @@ -160,9 +160,9 @@ te: changeset_paging_nav: showing_page: పేజీ %{page} next: తదుపరి » - previous: « గత + previous: « మునుపటి changeset: - anonymous: అజ్ఞాత + anonymous: అనామకం no_edits: (మార్పులు లేవు) changesets: id: ఐడీ @@ -178,18 +178,13 @@ te: new: title: కొత్త దినచర్య పద్దు form: - subject: 'విషయం:' - body: 'వివరణ:' - language: 'భాష:' - location: 'ప్రాంతం:' - latitude: 'అక్షాంశం:' - longitude: 'రేఖాంశం:' + location: ప్రాంతం use_map_link: పటాన్ని వాడు index: title: వాడుకరుల డైరీలు title_friends: స్నేహితుల దినచర్యలు title_nearby: చుట్టుపక్కల వాడుకరుల డైరీలు - user_title: '%{user} యొక్క దినచర్య' + user_title: '%{user} దినచర్య' in_language_title: '%{language}లో ఉన్న డైరీ పద్దులు' new: కొత్త దినచర్య పద్దు no_entries: డైరీ పద్దులు లేవు @@ -199,8 +194,8 @@ te: edit: title: డైరీ పద్దును మార్చు show: - title: వాడుకరుల డైరీలు | %{user} - user_title: '%{user} యొక్క డైరీ' + title: '%{user} డైరీ | %{title}' + user_title: '%{user} డైరీ' leave_a_comment: వ్యాఖ్యానించండి login_to_leave_a_comment_html: వ్యాఖ్యానించడానికి %{login_link} login: ప్రవేశించండి @@ -313,7 +308,7 @@ te: bridge: "yes": వంతెన building: - church: చర్చి + church: చర్చి కట్టడం "yes": భవనం craft: painter: పెయింటర్ @@ -508,9 +503,6 @@ te: created: ఎవరో (మీరే కావచ్చు) %{site_url} లో ఖాతాను సృష్టించారు. email_confirm: subject: '[ఓపెన్‌స్ట్రీట్‌మాప్] మీ ఈమెయిలు చిరునామాని నిర్ధారించండి' - email_confirm_plain: - click_the_link: అది మీరే అయితే, మార్పుని నిర్ధారించడానికి ఈ క్రింది లంకెను నొక్కండి. - email_confirm_html: click_the_link: అది మీరే అయితే, మార్పుని నిర్ధారించడానికి ఈ క్రింది లంకెను నొక్కండి. note_comment_notification: anonymous: అజ్ఞాత వాడుకరి @@ -540,6 +532,22 @@ te: back: వెనుకకు sent_message_summary: destroy_button: తొలగించు + shared: + markdown_help: + headings: శీర్షికలు + subheading: ఉప శీర్షిక + unordered: క్రమం లేని జాబితా + ordered: సక్రమ జాబితా + first: మొదటి అంశం + second: రెండవ అంశం + link: లంకె + text: పాఠ్యం + image: బొమ్మ + alt: ప్రత్యామ్నాయ పాఠ్యం + url: చిరునామా + richtext_field: + edit: మార్చు + preview: మునుజూపు site: about: next: తదుపరి @@ -583,7 +591,7 @@ te: help: title: సహాయం పొందడం welcome: - title: OSMకి స్వాగతం + title: ఓపెన్‌స్ట్రీట్‌మ్యాప్‌కి స్వాగతం sidebar: search_results: అన్వేషణ ఫలితాలు close: మూసివేయి @@ -660,7 +668,9 @@ te: owner: 'యజమాని:' description: 'వివరణ:' trace: - count_points: '%{count} బిందువులు' + count_points: + one: 1 బిందువు + other: '%{count} బిందువులు' more: మరిన్ని edit: మార్చు oauth_clients: @@ -735,7 +745,7 @@ te: add as friend: స్నేహితునిగా చేర్చు ct undecided: నిర్ణయించుకోలేదు ct declined: తిరస్కరించారు - latest edit: 'చివరి మార్పు %{ago}:' + latest edit: 'చివరి మార్పు (%{ago}):' email address: 'ఈమెయిలు చిరునామా:' status: 'స్థితి:' description: వివరణ @@ -853,6 +863,7 @@ te: share: title: పంచుకోండి cancel: రద్దుచేయి + image: బొమ్మ long_link: లంకె short_link: పొట్టి లంకె key: diff --git a/config/locales/th.yml b/config/locales/th.yml index cb417c0d7..a7094f080 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -172,15 +172,9 @@ th: x_years: '%{count} ปีก่อน' editor: default: ค่าปกติ (ขณะนี้ %{name}) - potlatch: - name: พอตแลตช์ 1 - description: พอตแลตช์ 1 (ตัวแก้ไขในเบราว์เซอร์) id: name: iD description: iD (ตัวแก้ไขในเบราว์เซอร์) - potlatch2: - name: พอตแลตช์ 2 - description: พอตแลตช์ 2 (ตัวแก้ไขในเบราว์เซอร์) remote: name: การควบคุมระยะไกล description: ตัวควบคุมระยะไกล (JOSM หรือ Merkaartor) @@ -381,12 +375,7 @@ th: new: title: สร้างรายการบันทึกใหม่ form: - subject: 'เรื่อง:' - body: 'เนื้อหา:' - language: 'ภาษา:' location: 'ที่ตั้ง:' - latitude: 'ละติจูด:' - longitude: 'ลองจิจูด:' use_map_link: ใช้แผนที่ index: title: บันทึกของผู้ใช้ @@ -1212,7 +1201,6 @@ th: footer: ท่านสามารถอ่านความคิดเห็นได้ที่ลิงก์ %{readurl} และแสดงความคิดเห็นตอบได้ที่ %{commenturl} หรือตอบกลับได้ที่ %{replyurl} message_notification: - subject_header: '[OpenStreetMap] %{subject}' hi: เรียนคุณ %{to_user}, header: 'ผู้ใช้ %{from_user} ส่งข้อความหาท่านผ่านทาง OpenStreetMap โดยมีหัวเรื่อง %{subject}:' @@ -1240,24 +1228,12 @@ th: welcome: หลังจากที่ยืนยันบัญชีของท่านแล้ว เราจะให้รายละเอียดเพิ่มเติมเพื่อให้ท่านเริ่มใช้งานเว็บไซต์ได้ต่อไป email_confirm: subject: '[OpenStreetMap] ยืนยันที่อยู่อีเมลของท่าน' - email_confirm_plain: - greeting: เรียนท่านผู้ใช้งาน - hopefully_you: มีบางคน (ซึ่งอาจเป็นท่าน) ประสงค์จะเปลี่ยนที่อยู่อีเมลที่รักษาไว้ที่ - %{server_url} เป็น %{new_address} - click_the_link: ถ้าเป็นท่านจริง ขอให้คลิกลิงก์ด้านล่างเพื่อยืนยันการเปลี่ยนแปลง - email_confirm_html: greeting: เรียนท่านผู้ใช้งาน hopefully_you: มีบางคน (ซึ่งอาจเป็นท่าน) ประสงค์จะเปลี่ยนที่อยู่อีเมลที่รักษาไว้ที่ %{server_url} เป็น %{new_address} click_the_link: ถ้าเป็นท่านจริง ขอให้คลิกลิงก์ด้านล่างเพื่อยืนยันการเปลี่ยนแปลง lost_password: subject: '[OpenStreetMap] คำขอเปลี่ยนรหัสผ่านใหม่' - lost_password_plain: - greeting: เรียนท่านผู้ใช้งาน - hopefully_you: มีบางคน (ซึ่งอาจเป็นท่าน) ขอเปลี่ยนรหัสผ่านซึ่งกำกับบัญชีผู้ใช้ - openstreetmap.org - click_the_link: หากเป็นท่านจริง โปรดคลิกลิงก์ข้างล่าง เพื่อดำเนินการเปลี่ยนรหัสผ่านใหม่ - lost_password_html: greeting: เรียนท่านผู้ใช้งาน hopefully_you: มีบางคน (ซึ่งอาจเป็นท่าน) ขอเปลี่ยนรหัสผ่านซึ่งกำกับบัญชีผู้ใช้ openstreetmap.org @@ -1556,16 +1532,6 @@ th: ท่านสามารถตั้งให้การแก้ไขของท่านมองเห็นได้ทั่วไปที่%{user_page} user_page_link: หน้าผู้ใช้ anon_edits_link_text: ค้นหาว่าทำไมจึงเป็นเช่นนี้ - flash_player_required_html: คุณต้องมี Flash Player เพื่อใช้ Potlatch ตัวแก้ไข - OpenStreetMap Flash คุณสามารถดาวน์โหลด - Flash Player ได้จาก Adobe.com นอกาจากนี้ยังมีตัวเลือกอื่น - ๆอีกสำหรับแก้ไข OpenStreetMap - potlatch_unsaved_changes: คุณมีการเปลี่ยนแปลงที่ยังไม่ได้บันทึก (เมื่อต้องการบันทึกใน - Potlatch คุณควรเลิกเลือกเส้นทางหรือจุดปัจจุบัน หากคุณกำลังแก้ไขในโหมดสด หรือคลิกบันทึกหากคุณมีปุ่มบันทึก) - potlatch2_not_configured: ยังไม่ได้กำหนดค่า Potlatch 2 - โปรดดู https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 - สำหรับข้อมูลเพิ่มเติม - potlatch2_unsaved_changes: คุณมีการเปลี่ยนแปลงที่ยังไม่ได้บันทึก (เมื่อต้องการบันทึกใน - Potlatch 2 คุณจะต้องคลิกบันทึก) id_not_configured: ยังไม่ได้กำหนดค่า iD no_iframe_support: เบราว์เซอร์ของท่านไม่รองรับการใช้งานเฟรมภายในหน้า HTML จึงไม่สามารถใช้ส่วนประกอบนี้ได้ export: diff --git a/config/locales/tl.yml b/config/locales/tl.yml index 5bc165d41..8e94aa832 100644 --- a/config/locales/tl.yml +++ b/config/locales/tl.yml @@ -122,15 +122,9 @@ tl: with_version: '%{id}, v%{version}' editor: default: Likas na pagtatakda (kasalukuyang %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (patnugot na nasa loob ng pantingin-tingin) id: name: iD description: iD (patnugot na nasa loob ng pantingin-tingin) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (patnugot na nasa loob ng pantingin-tingin) remote: name: Pangmalayong Pantaban description: Pangmalayong Pantaban (JOSM o Merkaartor) @@ -274,12 +268,7 @@ tl: new: title: Bagong Pagpapasok sa Talaarawan form: - subject: 'Paksa:' - body: 'Katawan:' - language: 'Wika:' location: 'Pook (lokasyon):' - latitude: 'Latitud:' - longitude: 'Longhitud:' use_map_link: gamitin ang mapa index: title: Mga talaarawan ng mga tagagamit @@ -898,7 +887,6 @@ 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_header: '[OpenStreetMap] %{subject}' hi: Kumusta %{to_user}, header: 'Nagpadala sa iyo si %{from_user} ng isang mensahe sa pamamagitan ng OpenStreetMap na may paksang %{subject}:' @@ -922,26 +910,12 @@ tl: greeting: Kamusta! email_confirm: subject: '[OpenStreetMap] Tiyakin ang iyong tirahan ng e-liham' - email_confirm_plain: - greeting: Kumusta, - click_the_link: Kung ikaw ito, mangyaring pindutin ang kawing na nasa ibaba - upang tiyakin ang pagbabago. - email_confirm_html: greeting: Kumusta, - hopefully_you: May isang tao (ikaw sana) ang nagnanais na baguhin ang kanilang - tirahan ng e-liham doon sa %{server_url} papunta sa %{new_address}. click_the_link: Kung ikaw ito, mangyaring pindutin ang kawing na nasa ibaba upang tiyakin ang pagbabago. lost_password: subject: '[OpenStreetMap] Muling pagtatakda ng hudyat' - lost_password_plain: - greeting: Kumusta, - click_the_link: Kung ikaw ito, mangyaring pindutin ang kawing na nasa ibaba - upang itakdang muli ang hudyat mo. - lost_password_html: greeting: Kumusta, - hopefully_you: May isang tao (maaaring ikaw) ang humiling na itakdang muli ang - hudyat dito sa akawnt ng openstreetmap.org ng tirahang ito ng e-liham. click_the_link: Kung ikaw ito, mangyaring pindutin ang kawing na nasa ibaba upang itakdang muli ang hudyat mo. note_comment_notification: @@ -1186,19 +1160,6 @@ tl: user_page_link: pahina ng tagagamit anon_edits_html: (%{link}) anon_edits_link_text: Alamin kung bakit ganito ang katayuan. - flash_player_required_html: Kailangan mo ng isang tagapagpaandar na Flash upang - magamit ang Potlatch, ang patnugot na Flash ng OpenStreetMap. Maaari mong - ikargang - paibaba ang Flash Player magmula sa Adobe.com. Ilang - pang mga mapagpipilian ang makukuha rin para sa pamamatnugot ng OpenStreetMap. - potlatch_unsaved_changes: Mayroon kang mga pagbabagong hindi pa nasasagip. (Upang - makapagsagip sa Potlatch, dapat mong huwag piliin ang pangkasalukuyang daan - o tuldok, kung namamatnugot sa pamamaraang buhay, o pindutin ang sagipin kung - mayroon kang isang pindutang sagipin.) - potlatch2_not_configured: Hindi pa naisasaayos ang Potlatch 2 - mangyaring tingnan - ang http://wiki.openstreetmap.org/wiki/The_Rails_Port - potlatch2_unsaved_changes: Mayroon kang mga pagbabagong hindi pa nasasagip. - (Upang masagip sa Potlatch 2, dapat mong pindutin ang sagipin.) no_iframe_support: Hindi tinatangkilik ng pantingin-tingin mo ang mga iframe ng HTML, na kailangan para sa tampok na ito. export: diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 2ad1f7a6b..6364f16c1 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -127,7 +127,7 @@ tr: support_url: Destek Bağlantısı allow_read_prefs: kullanıcı tercihlerini okuyun allow_write_prefs: onların kullanıcı tercihlerini değiştir - allow_write_diary: günlük girişleri, yorumlar oluşturun ve arkadaş edinin + allow_write_diary: günlük girdiler, yorumlar oluşturun ve arkadaş edinin allow_write_api: haritayı değiştir allow_read_gpx: özel GPS izlerini oku allow_write_gpx: GPS izlerini yükle @@ -215,18 +215,12 @@ tr: other: '%{count} yıl önce' editor: default: Varsayılan (kullanılan %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (tarayıcı içi düzenleyici) id: name: iD description: iD (tarayıcı düzenleyici) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (tarayıcı içi düzenleyici) remote: name: Uzaktan Denetim - description: Uzaktan Denetim (JOSM veya Merkaartor) + description: Uzaktan Kontrolü (JOSM, Potlatch, Merkaartor) auth: providers: none: Hiçbiri @@ -280,7 +274,7 @@ tr: one: 1 yol other: '%{count} yol' download_xml: XML Ä°ndir - view_history: Geçmişi Gör + view_history: Geçmişi Görüntüle view_details: Ayrıntıları Görüntüle location: 'Konum:' common_details: @@ -297,12 +291,12 @@ tr: comment: Yorumlar (%{count}) hidden_commented_by_html: '%{user} tarafından gizli yorum %{when}' commented_by_html: '%{user} kullanıcıdan yorum %{when}' - changesetxml: Değişiklik kaydı XML + changesetxml: ' XML değişiklik kaydı' osmchangexml: osmChange XML feed: title: Değişiklik kaydı %{id} title_comment: Değişiklik takımı %{id} - %{comment} - join_discussion: Tartışmaya katılmak için lütfen giriş yap + join_discussion: Tartışmaya katılmak için lütfen giriş yapın discussion: Tartışma still_open: Değişiklik kaydı hâlâ açık - tartışma, değişiklik serisi kapatıldığında açılacaktır. @@ -343,7 +337,7 @@ tr: way: yol relation: ilişki changeset: değişiklik kaydı - note: Not + note: not timeout: title: Zaman Aşımı Hatası sorry: Üzgünüz, %{type} olan verisi %{id} almak için çok uzun sürdü. @@ -352,7 +346,7 @@ tr: way: yol relation: ilişki changeset: değişiklik kaydı - note: Not + note: not redacted: redaction: Redaksiyon %{id} message_html: Bu %{type} için %{version} versiyonununda düzenlemeler hemen görülemez. @@ -372,11 +366,11 @@ tr: wiki_link: key: '%{key} parametresi için Viki açıklaması' tag: '%{key}=%{value} parametresi için Viki açıklaması' - wikidata_link: Vikidata'da bulunan %{page} öğesi - wikipedia_link: Vikipedi'deki %{page} makalesi - wikimedia_commons_link: Wikimedia Commons'daki %{page} maddesi - telephone_link: '%{phone_number} ara' - colour_preview: Renk %{colour_value} önizleme + wikidata_link: Vikiveri'deki %{page} ögesi + wikipedia_link: Vikipedi'deki %{page} maddesi + wikimedia_commons_link: Wikimedia Commons'daki %{page} ögesi + telephone_link: 'Ara: %{phone_number}' + colour_preview: '%{colour_value} renginin önizlemesi' note: title: 'Not: %{id}' new_note: Yeni Not @@ -405,10 +399,10 @@ tr: report: Bu notu bildir coordinates_html: '%{latitude}, %{longitude}' query: - title: Özellikleri Göster - introduction: Yakın diğer özellikleri bulmak için harita üzerine tıklayın. - nearby: Yakındaki özellikleri - enclosing: Kapsayan özellikleri + title: Sorgu Özellikleri + introduction: Yakındaki özellikleri bulmak için haritaya tıklayın. + nearby: Yakındaki özellikler + enclosing: Kapsayan özellikler changesets: changeset_paging_nav: showing_page: '%{page}. sayfa' @@ -440,35 +434,30 @@ tr: sorry: Üzgünüz, değişiklik kayıtlarının listelenmesi fazla sürdü. changeset_comments: comment: - comment: 'Değişiklik seti #%{changeset_id} hakkında %{author} yeni bir yorum + comment: '#%{changeset_id} değişiklik kaydı hakkında %{author}, yeni bir yorum yaptı.' commented_at_by_html: '%{user} tarafından %{when} güncellendi' comments: - comment: 'Değişiklik seti #%{changeset_id} hakkında %{author} yeni bir yorum - yaptı.' + comment: '#%{changeset_id} değişiklik kaydı hakkında %{author}, yeni bir yorum + yaptı' index: - title_all: OpenStreetMap değişiklik tartışması - title_particular: 'OpenStreetMap değişiklik #%{changeset_id} tartışması' + title_all: OpenStreetMap değişiklik kaydı tartışması + title_particular: 'OpenStreetMap #%{changeset_id} değişiklik kaydı tartışması' timeout: - sorry: Üzgünüz, talep ettiğiniz değişiklik listesi yorumlarının alınması çok - uzun sürdü. + sorry: Üzgünüz, talep ettiğiniz değişiklik kaydı yorumlarının alınması çok uzun + sürdü. diary_entries: new: title: Yeni Günlük Girdisi form: - subject: 'Konu:' - body: 'Mesaj:' - language: 'Dil:' - location: 'Konum:' - latitude: 'Enlem:' - longitude: 'Boylam:' - use_map_link: haritayı kullan + location: Konum + use_map_link: Haritayı Kullan index: title: Kullanıcıların günlükleri title_friends: Arkadaşların günlükleri title_nearby: Yakındaki kullanıcıların günlükleri user_title: '%{user} kullanıcısının günlüğü' - in_language_title: '%{language} dillindeki günlük girdileri' + in_language_title: '%{language} dillindeki günlük girdiler' new: Yeni Günlük Girdisi new_title: Kullanıcı günlüğümde yeni bir girdi oluştur my_diary: Günlüğüm @@ -477,7 +466,7 @@ tr: older_entries: Daha Eski Girdiler newer_entries: Daha Yeni Girdiler edit: - title: Günlük Girdisi Düzenle + title: Günlük Girdisini Düzenle marker_text: Günlük girdisinin konumu show: title: '%{user} kullanıcısının günlüğü | %{title}' @@ -497,8 +486,8 @@ tr: comment_link: Bu girdiyi yorumla reply_link: Yazara mesaj gönder comment_count: - one: 1 yorum - zero: yorumsuz + zero: Yorum yok + one: '%{count} yorum' other: '%{count} yorum' edit_link: Bu girdiyi düzenle hide_link: Bu girdiyi gizle @@ -520,7 +509,7 @@ tr: feed: user: title: '%{user} için OpenStreetMap günlük girdileri' - description: '%{user} adlı kullanıcının en yeni OpenStreetMap günlük girdileri' + description: '%{user} kullanıcısının en yeni OpenStreetMap günlük girdileri' language: title: '%{language_name} dillindeki OpenStreetMap günlük girdileri' description: OpenStreetMap kullanıcılarının %{language_name} dillindeki en @@ -539,38 +528,37 @@ tr: make_friend: heading: '%{user} adlı kullanıcı arkadaş olarak eklensin mi?' button: Arkadaş olarak ekle - success: '%{name} arkadaş listesinde eklendi.' - failed: Üzgünüz, %{name} adlı kullanıcı arkadaş olarak eklenemedi. + success: '%{name} arkadaş listesine eklendi!' + failed: Üzgünüz, %{name} arkadaş olarak eklenemedi. already_a_friend: '%{name} ile zaten arkadaşsın.' remove_friend: - heading: '%{user} adlı kullanıcı arkadaşlıktan çıkarılsın mı?' + heading: '%{user}, arkadaşlıktan çıkarılsın mı?' button: Arkadaşlıktan çıkar - success: '%{name} arkadaş listesinden çıkarıldı.' + success: '%{name}, arkadaş listesinden çıkarıldı.' not_a_friend: '%{name}, arkadaşın değil.' geocoder: search: title: - latlon_html: OSM'in sonuçları - ca_postcode_html: Geocoder.CA'dan sonuçları + latlon_html: OSM sonuçları + ca_postcode_html: Geocoder.CA sonuçları osm_nominatim_html: OSM Nominatim sonuçları - geonames_html: GeoNames'in sonuçları + geonames_html: GeoNames sonuçları osm_nominatim_reverse_html: OpenStreetMap - Nominatim'in sonuçları - geonames_reverse_html: GeoNames'in - sonuçları + Nominatim sonuçları + geonames_reverse_html: GeoNames sonuçları search_osm_nominatim: prefix: aerialway: cable_car: Teleferik - chair_lift: Chair Lift - drag_lift: Sürükleyen Asansör - gondola: Telesiyej + chair_lift: Telesiyej + drag_lift: Kayak Teleferiği + gondola: Telesiyej Hattı magic_carpet: Magic Halı Kaydırağı - platter: Teleferik - pylon: Pilon + platter: Tabak Asansörü + pylon: Direk station: Teleferik Ä°stasyonu - t-bar: T-Bar Kaldırma + t-bar: T-Bar Asansörü "yes": Havayolu aeroway: aerodrome: Havaalanı @@ -578,17 +566,17 @@ tr: apron: Apron gate: Kapı hangar: Hangar - helipad: Helikopter alanı + helipad: Helikopter Pisti holding_position: Tespit Mevzii navigationaid: Havacılık Gezinme yardımı parking_position: Park Yeri - runway: Uçak pisti - taxilane: Taksi şeridi - taxiway: Taksi yolu + runway: Uçak Pisti + taxilane: Taksi Şeridi + taxiway: Taksi Yolu terminal: Terminal - windsock: Rüzgâr hortumu + windsock: Rüzgâr Hortumu amenity: - animal_boarding: Hayvan Yatılı + animal_boarding: Hayvan Binişi animal_shelter: Hayvan Barınağı arts_centre: Sanat Merkezi atm: ATM @@ -597,54 +585,54 @@ tr: bbq: Mangal alanı bench: Bank bicycle_parking: Bisiklet Parkı - bicycle_rental: Bisiklet kiralama + bicycle_rental: Bisiklet Kiralama bicycle_repair_station: Bisiklet Tamir Ä°stasyonu biergarten: Bira Bahçesi blood_bank: Kan Bankası boat_rental: Tekne Kiralama brothel: Genelev - bureau_de_change: Döviz bürosu + bureau_de_change: Döviz Bürosu bus_station: Otogar - cafe: Cafe + cafe: Kafe car_rental: Araba Kiralama car_sharing: Araç Paylaşımı car_wash: Oto Yıkama - casino: Kasino + casino: Gazino charging_station: Şarj Ä°stasyonu childcare: Çocuk Bakımı cinema: Sinema clinic: Klinik clock: Saat - college: Lise + college: Yüksekokul community_centre: Topluluk Merkezi conference_centre: Konferans Merkezi courthouse: Adliye crematorium: Krematoryum - dentist: Diş hekimi + dentist: Diş Hekimi doctors: Doktorlar drinking_water: İçme Suyu driving_school: Sürücü Kursu embassy: Elçilik events_venue: Etkinlik Mekanı - fast_food: Büfe / Fast Food + fast_food: Fast Food ferry_terminal: Feribot Terminali - fire_station: Itfaiye + fire_station: Ä°tfaiye food_court: Yiyecek Reyonu - fountain: Fıskiye - fuel: Petrol ofisi + fountain: Çeşme + fuel: Petrol Ofisi gambling: Kumarhane grave_yard: Mezarlık - grit_bin: kum kovası + grit_bin: Kum Kovası hospital: Hastane hunting_stand: Avcılık Standı ice_cream: Dondurma internet_cafe: Ä°nternet Kafe kindergarten: Kreş - language_school: Dil okulu + language_school: Dil Okulu library: Kütüphane - loading_dock: Yükleme Yuvası - love_hotel: Sevgi Oteli - marketplace: Pazar yeri + loading_dock: Yükleme Peronu + love_hotel: Aşk Oteli + marketplace: Pazar Yeri mobile_money_agent: Mobil Para Aracısı monastery: Manastır money_transfer: Para Transferi @@ -653,25 +641,25 @@ tr: nightclub: Gece Kulübü nursing_home: Huzurevi parking: Otopark - parking_entrance: Park Yerinin Girişi + parking_entrance: Park Yeri Girişi parking_space: Park Alanı payment_terminal: Ödeme Terminali pharmacy: Eczane - place_of_worship: Ä°badethane / Tapınak + place_of_worship: Ä°badethane police: Polis post_box: Posta kutusu post_office: Postane prison: Cezaevi - pub: Birahane + pub: Pub public_bath: Hamam - public_bookcase: Herkese Açık Kitaplık + public_bookcase: Kamu Kütüphanesi public_building: Kamu Binası ranger_station: Bekçi Ä°stasyonu - recycling: Geri dönüşüm noktası + recycling: Geri Dönüşüm Noktası restaurant: Restoran sanitary_dump_station: Sıhhi Boşaltma Ä°stasyonu school: Okul - shelter: Korunak + shelter: Barınak shower: Duş social_centre: Sosyal Merkez social_facility: Sosyal Tesis @@ -681,20 +669,20 @@ tr: telephone: Telefon theatre: Tiyatro toilets: Tuvalet - townhall: Belediye binası + townhall: Belediye Binası training: Eğitim Tesisi university: Üniversite vehicle_inspection: Araç Muayenesi - vending_machine: Satış makinesi + vending_machine: Satış Otomatı veterinary: Veteriner - village_hall: Köy odası - waste_basket: Çöp sepeti + village_hall: Köy Meydanı + waste_basket: Çöp Sepeti waste_disposal: Atık Alanı waste_dump_site: Atık Boşaltma Alanı watering_place: Sulama Yeri water_point: Musluk weighbridge: Kantar - "yes": Rahatlık + "yes": Tesis boundary: aboriginal_lands: Aborijin Toprakları administrative: Ä°dari Sınır @@ -704,18 +692,18 @@ tr: protected_area: Korumalı Alan "yes": Sınır bridge: - aqueduct: Su kemeri - boardwalk: Deniz kıyısındaki tahta yol - suspension: Asma köprüsü - swing: Asma Köprüsü + aqueduct: Su Kemeri + boardwalk: Kaldırım + suspension: Asma Köprü + swing: Açılır Kapanır Köprü viaduct: Viyadük "yes": Köprü building: apartment: Apartman apartments: Apartmanlar barn: Ahır - bungalow: Tek Katlı Ev - cabin: Kabin + bungalow: Bungalov + cabin: Kulübe chapel: Şapel church: Kilise Binası civic: Sivil Yapı @@ -724,7 +712,7 @@ tr: construction: Yapım Aşamasındaki Bina detached: Müstakil Ev dormitory: Yurt - duplex: Çift Katlı Ev + duplex: Ä°ki Katlı Ev farm: Çiftlik Evi farm_auxiliary: Yedek Çiftlik Evi garage: Garaj @@ -735,8 +723,8 @@ tr: hotel: Otel Binası house: Ev houseboat: Tekne Ev - hut: Kulübe - industrial: Sınai Bina + hut: Baraka + industrial: Endüstriyel Bina kindergarten: Anaokulu Binası manufacture: Ä°malat Binası office: Ofis Binası @@ -744,7 +732,7 @@ tr: residential: Konut Ä°nşaatı retail: Perakende Binası roof: Çatı - ruins: Yıkık Bina + ruins: Virane school: Okul Binası semidetached_house: Yarı Müstakil Ev service: Hizmet Binası @@ -762,12 +750,12 @@ tr: sport: Spor Kulübü "yes": Kulüp craft: - beekeper: Arıcı + beekeper: Arı Yetiştiricisi blacksmith: Demirci brewery: Bira Fabrikası carpenter: Marangoz - caterer: Caterer - confectionery: Şekerleme + caterer: Bayi + confectionery: Şekerlemeci dressmaker: Terzi electrician: Elektrikçi electronics_repair: Elektronik Tamiri @@ -784,7 +772,7 @@ tr: shoemaker: Ayakkabıcı stonemason: Taş Ustası tailor: Terzi - window_construction: Pencere Üretici + window_construction: Pencere Üreticisi winery: Şaraphane "yes": El Sanatları Mağazası emergency: @@ -795,7 +783,7 @@ tr: fire_xtinguisher: Yangın Söndürücü fire_water_pond: Ateş Suyu Göleti landing_site: Acil Ä°niş Alanı - life_ring: Acil Yaşam Yüzüğü + life_ring: Can Yeleği phone: Acil Durum Telefonu siren: Acil Siren suction_point: Acil Emiş Noktası @@ -803,38 +791,38 @@ tr: "yes": Acil highway: abandoned: Terk Edilmiş Karayolu - bridleway: At yürüyüş yolu - bus_guideway: Rehberli otobüs hattı - bus_stop: Otobüs durağı - construction: Ä°nşaa halinde yolu + bridleway: At Binme Yolu + bus_guideway: Rehberli Otobüs Hattı + bus_stop: Otobüs Durağı + construction: Yapım Aşamasında Karayolu corridor: Koridor cycleway: Bisiklet Yolu elevator: Asansör emergency_access_point: Acil Erişim Noktası emergency_bay: Acil Durum Yuvası - footway: Yaya yolu - ford: Akarsu geçidi - give_way: Yol işareti ver - living_street: Yaşam sokağı + footway: Yaya Yolu + ford: Akarsu Geçidi + give_way: Yol İşareti Ver + living_street: Yaya Öncelikli Yol milestone: Kilometre taşı motorway: Otoyol motorway_junction: Otoyol Kavşağı - motorway_link: Otoyol bağlantısı - passing_place: Geçilen yer + motorway_link: Otoyol Bağlantısı + passing_place: Geçiş Yeri path: Patika - pedestrian: Trafiğe kapalı yolu + pedestrian: Yaya Yolu platform: Peron - primary: Devlet Yolu - primary_link: Devlet Yolu bağlantısı + primary: Ana Yol + primary_link: Ana Yol Bağlantısı proposed: Planlanmış Yol - raceway: Koşu yolu + raceway: Yarış Pisti residential: Sokak rest_area: Dinlenme Alanı road: Yol - secondary: Ä°l yolu - secondary_link: Ä°l yolunun bağlantısı + secondary: Tali Yol + secondary_link: Tali Yol Bağlantısı service: Servis Yolu - services: Dinleme Tesisi + services: Otoyol Hizmetleri speed_camera: Hız Kamerası steps: Merdiven stop: Dur işareti @@ -1483,13 +1471,21 @@ tr: hi: Merhaba %{to_user}, header: '%{from_user}, %{subject} konulu OpenStreetMap günlük girdisi hakkında yorum yaptı.' + header_html: '%{from_user}, %{subject} konulu OpenStreetMap günlük girdisi hakkında + yorum yaptı:' footer: Ayrıca yorumu %{readurl} adresinden okuyabilir ve %{commenturl} adresinden yorum yapabilir veya yazara %{replyurl} adresinden mesaj gönderebilirsiniz. + footer_html: Ayrıca yorumu %{readurl} adresinden okuyabilir ve %{commenturl} + adresinden yorum yapabilir veya yazara %{replyurl} adresinden mesaj gönderebilirsiniz. message_notification: - subject_header: '[OpenStreetMap] %{subject}' + subject: '[OpenStreetMap] %{message_title}' hi: Merhaba %{to_user}, header: 'OpenStreetMap kullanıcı %{from_user} sana %{subject} konulu bir mesaj gönderdi:' + header_html: '%{from_user}, size OpenStreetMap üzerinden %{subject} konulu bir + mesaj gönderdi:' + footer: Ayrıca mesajı %{readurl} adresinde okuyabilir ve yazara %{replyurl} + adresinden mesaj gönderebilirsiniz. footer_html: Ä°letiyi %{readurl} adresinden de okuyabilir ve yazara %{replyurl} adresinden ileti gönderebilirsiniz. friendship_notification: @@ -1497,7 +1493,9 @@ tr: subject: '[OpenStreetMap] kullanıcı %{user} seni arkadaş olarak ekledi' had_added_you: Kullanıcı %{user} seni arkadaş olarak OpenStreetMap'te ekledi. see_their_profile: '%{userurl} üzerinden profillerini görebilirsiniz.' + see_their_profile_html: '%{userurl} üzerinden profilini görebilirsiniz.' befriend_them: '%{befriendurl} üzerinden arkadaş olarak da ekleyebilirsiniz.' + befriend_them_html: '%{befriendurl} üzerinden arkadaş olarak da ekleyebilirsiniz.' gpx_description: description_with_tags_html: '%{trace_description} açıklamasına ve şu etiketlere sahip %{trace_name} GPX dosyanız gibi görünüyor: %{tags}' @@ -1527,27 +1525,13 @@ tr: bilgiler vereceğiz. email_confirm: subject: '[OpenStreetMap] E-posta adresi onaylama mesajı' - email_confirm_plain: greeting: Merhaba, hopefully_you: Birisi (umarız ki siz) %{server_url} adresindeki e-posta adresinizi %{new_address} olarak değiştirmek istiyor. click_the_link: Bu e-posta adresi sana aitse onaylamak için aşağıdaki bağlantıyı tıkla. - email_confirm_html: - greeting: Merhaba, - hopefully_you: Birisi (umarım sen) %{server_url} deki kayıtlı olan e-posta adresi - %{new_address} olarak değiştirmek istiyor. - click_the_link: Bu e-postayı sana aitse onaylamak için aşağıdaki bağlantıyı - tıkla. lost_password: subject: '[OpenStreetMap] Parola sıfırlama isteği' - lost_password_plain: - greeting: Merhaba, - hopefully_you: Birisi (muhtemelen siz) bu e-posta adresinin openstreetmap.org - hesabındaki şifresinin sıfırlanmasını istedi. - click_the_link: Bu sizseniz, lütfen parolanızı sıfırlamak için aşağıdaki bağlantıya - tıklayın. - lost_password_html: greeting: Merhaba, hopefully_you: Birisi (muhtemelen siz) bu e-posta adresinin openstreetmap.org hesabındaki şifresinin sıfırlanmasını istedi. @@ -1563,25 +1547,38 @@ tr: yorum yaptı.' your_note: '%{commenter}, %{place} yakınlarındaki harita notlarınızdan biri üzerinde bir yorum yaptı.' + your_note_html: '%{commenter}, %{place} yakınlarındaki harita notlarınızdan + biri üzerinde bir yorum yaptı.' commented_note: '%{commenter}, yorum yaptığınız bir harita notu üzerine yorum yaptı. Bu not %{place} yakınlarında.' + commented_note_html: '%{commenter}, yorum yaptığınız bir harita notu üzerine + yorum yaptı. Bu not %{place} yakınlarında.' closed: subject_own: '[OpenStreetMap] %{commenter}, notlarınızdan birini çözdü.' subject_other: '[OpenStreetMap] %{commenter}, ilgilendiğiniz notlardan birini çözdü' your_note: '%{commenter}, %{place} yakınlarındaki harita notlarınızdan birini çözdü.' + your_note_html: '%{commenter}, %{place} yakınlarındaki harita notlarınızdan + birini çözdü.' commented_note: '%{commenter} yorum yaptığınız harita notlarınızdan birini çözdü. Bu not %{place} yakınlarında.' + commented_note_html: '%{commenter} yorum yaptığınız harita notlarınızdan birini + çözdü. Bu not %{place} yakınlarında.' reopened: subject_own: '[OpenStreetMap] %{commenter}, notlarınızdan birini yeniden etkinleştirdi.' subject_other: '[OpenStreetMap] %{commenter}, ilgilendiğiniz bir notu yeniden etkinleştirdi' your_note: '%{commenter}, %{place} yakınlarındaki harita notlarınızdan birini yeniden etkinleştirdi.' + your_note_html: '%{commenter}, %{place} yakınlarındaki harita notlarınızdan + birini yeniden etkinleştirdi.' commented_note: '%{commenter}, yorumladığınız bir harita notunu yeniden etkinleştirdi. Not, %{place} yakınlarında yer almakta.' + commented_note_html: '%{commenter}, yorumladığınız bir harita notunu yeniden + etkinleştirdi. Not, %{place} yakınlarında yer almakta.' details: Not hakkındaki ayrıntılı bilgiler %{url} bağlantısında görülebilir. + details_html: Notla ilgili daha fazla ayrıntı %{url} adresinde bulunabilir. changeset_comment_notification: hi: Merhaba %{to_user}, greeting: Merhaba, @@ -1592,13 +1589,22 @@ tr: hakkında yorum yaptı.' your_changeset: '%{commenter}, değişiklik kümelerinizden birine %{time} tarihinde yorum yaptı' + your_changeset_html: '%{commenter}, değişiklik kümelerinizden birine %{time} + tarihinde yorum yaptı' commented_changeset: '%{commenter}, %{time} tarihinde, izlemekte olduğunuz bir değişiklik kümesi için %{changeset_author} tarafından yorum yaptı.' + commented_changeset_html: '%{commenter}, %{time} tarihinde, izlemekte olduğunuz + bir değişiklik kümesi için %{changeset_author} tarafından yorum yaptı.' partial_changeset_with_comment: '''%{changeset_comment}'' yorumuyla' + partial_changeset_with_comment_html: '''%{changeset_comment}'' yorumuyla' partial_changeset_without_comment: yorumsuz details: Değişiklik kaydıyla ilgili daha fazla bilgi %{url} sayfasından edinebilirsiniz. + details_html: Değişiklik kümesiyle ilgili daha fazla ayrıntı %{url} adresinde + bulunabilir. unsubscribe: Bu değişiklik kaydının güncellemelerini aboneliğinizden çıkarmak için %{url} sayfasını ziyaret edin ve "Aboneliği iptal et"i tıklayın. + unsubscribe_html: Bu değişiklik kümesiyle ilgili güncellemelerden çıkmak için + %{url} adresini ziyaret edin ve "Abonelikten çık" seçeneğine tıklayın. messages: inbox: title: Gelen kutusu @@ -1623,7 +1629,7 @@ tr: reply_button: Yanıtla destroy_button: Sil new: - title: Mesaj Gönder + title: Mesaj gönder send_message_to_html: '%{name}''ya yeni bir mesaj gönder' subject: Konu body: Mesaj @@ -1674,6 +1680,25 @@ tr: as_unread: Mesaj okunmadı olarak işaretlendi destroy: destroyed: Mesaj silindi + shared: + markdown_help: + title_html: kramdown + 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 + link: Bağlantı + text: Metin + image: Resim + alt: Alt metin + url: URL + richtext_field: + edit: Düzenle + preview: Önizleme site: about: next: Ä°leri @@ -1699,10 +1724,10 @@ tr: OSM Foundation websitesine bakınız. open_data_title: Açık Veri open_data_html: |- - OpenStreetMap, açık veridir: OpenStreetMap ve katkıda bulunan + OpenStreetMap, açık veridir: OpenStreetMap ve katkıda bulunan kişilere referans verdiğiniz sürece OpenStreetMap herhangi bir amaç için kullanabilirsiniz. - Verileri belirli şekillerde değiştirir veya üzerine inşa ederseniz sonucu sadece aynı lisansla dağıtabilirsiniz. Detaylı bilgi için Telif hakkı ve - Lisans sayfasına göz atınız. + Verileri belirli şekillerde değiştirir veya üzerine inşa ederseniz, sonucu yalnızca aynı lisansla dağıtabilirsiniz. Ayrıntılı bilgi için Telif hakkı ve + Lisans sayfasına bakın. legal_title: Yasal legal_1_html: |- Bu site ve diğer birçok ilgili hizmet resmi olarak @@ -1868,18 +1893,6 @@ tr: user_page_link: kullanıcı sayfası anon_edits_html: (%{link}) anon_edits_link_text: Durumun neden böyle olduğunu öğrenin. - flash_player_required_html: OpenStreetMap Flash düzenleyicisi Potlatch'ı kullanmak - için bir Flash oynatıcıya ihtiyacınız var. Adobe.com'dan - Flash Player yükleyebilirsiniz. OpenStreetMap'i düzenlemek için başka - birçok seçenek de - mevcuttur. - potlatch_unsaved_changes: Kaydedilmemiş değişiklikleriniz mevcut. (Potlatch'te - kaydetmek için canlı modda düzenleme yapıyorsanız geçerli yolu veya noktayı - seçmeniz veya bir kaydetme düğmeniz varsa kaydet'i tıklamanız gerekir.) - potlatch2_not_configured: 'Potlatch 2 yapılandırılmadı - daha fazla bilgi için - lütfen bakınız: https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2' - potlatch2_unsaved_changes: Kaydedilmemiş değişiklikleriniz var. (Potlatch 2'de - kaydetmek için kaydet'e tıklamalısınız.) id_not_configured: iD yapılandırılmamış no_iframe_support: Bu özelliği görüntülemek için gerekli olan HTML iframe tarayıcınız desteklemiyor. @@ -1992,6 +2005,15 @@ tr: url: https://wiki.openstreetmap.org/ title: OpenStreetMap Viki description: Ayrıntılı OpenStreetMap belgeleri için wiki'ye göz atın. + potlatch: + removed: Varsayılan OpenStreetMap düzenleyiciniz Potlatch olarak ayarlanmıştır. + Adobe Flash Player geri çekildiğinden, Potlatch artık bir web tarayıcısında + kullanılamaz. + desktop_html: Potlatch'ı Mac ve + Windows için masaüstü uygulamasını indirerek kullanmaya devam edebilirsiniz. + id_html: Alternatif olarak, varsayılan düzenleyicinizi, daha önce Potlatch'ın + yaptığı gibi web tarayıcınızda çalışan iD olarak ayarlayabilirsiniz. Kullanıcı + ayarlarınızı buradan değiştirin. sidebar: search_results: Arama Sonuçları close: Kapat diff --git a/config/locales/tt.yml b/config/locales/tt.yml index eb2905938..e2b41d819 100644 --- a/config/locales/tt.yml +++ b/config/locales/tt.yml @@ -124,8 +124,6 @@ tt: one: 1 ел элек other: '%{count} ел элек' editor: - potlatch: - name: Potlatch 1 id: name: iD remote: @@ -204,12 +202,7 @@ tt: load_more: Күбрәк төяү diary_entries: form: - subject: 'Тема:' - body: 'Текст:' - language: 'Тел:' location: 'Урын:' - latitude: 'Киңлек:' - longitude: 'Озынлык:' use_map_link: Харитада күрсәтергә index: title: Көндәлекләр @@ -575,13 +568,9 @@ tt: hi: Сәлам, %{to_user}, signup_confirm: greeting: Сәлам! - email_confirm_plain: + email_confirm: greeting: Сәлам, - email_confirm_html: - greeting: Сәлам, - lost_password_plain: - greeting: Сәлам, - lost_password_html: + lost_password: greeting: Сәлам, note_comment_notification: greeting: Сәлам, diff --git a/config/locales/uk.yml b/config/locales/uk.yml index d1391f8b6..6e9f0fbee 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -11,6 +11,7 @@ # Author: Arturyatsko # Author: Avatar6 # Author: Base +# Author: Bicolino34 # Author: Choomaq # Author: Dim Grits # Author: Dittaeva @@ -21,6 +22,8 @@ # Author: Green Zero # Author: Gzhegozh # Author: KEL +# Author: Kareyac +# Author: Lxlalexlxl # Author: Macofe # Author: Movses # Author: Mykola Swarnyk @@ -162,6 +165,7 @@ uk: description: Опис languages: Мови pass_crypt: Пароль + pass_crypt_confirmation: Підтвердьте пароль help: trace: tagstring: через кому @@ -221,17 +225,14 @@ uk: few: '%{count} роки тому' many: '%{count} років тому' other: '%{count} років тому' + printable_name: + with_version: '%{id}, v%{version}' + with_name_html: '%{name} (%{id})' editor: default: Типовий (зараз %{name}) - potlatch: - name: Потлач 1 - description: Потлач 1 (редактор в оглядачі) id: name: iD description: iD (редактор в оглядачі) - potlatch2: - name: Потлач 2 - description: Потлач 2 (редактор в оглядачі) remote: name: Дистанційне керування description: Дистанційне керування (JOSM або Merkaartor) @@ -442,12 +443,7 @@ uk: new: title: Створити новий запис у щоденнику form: - subject: 'Тема:' - body: 'Текст:' - language: 'Мова:' location: 'Місце:' - latitude: 'Широта:' - longitude: 'Довгота:' use_map_link: Вказати на мапі index: title: Щоденники користувачів @@ -611,9 +607,11 @@ uk: ice_cream: Морозиво kindergarten: Дитячий садок library: Бібліотека + love_hotel: Любовний Готель marketplace: Ринок monastery: Монастир motorcycle_parking: Стоянка мотоциклів + music_school: Музична Школа nightclub: Нічний клуб nursing_home: Будинок престарілих parking: Стоянка @@ -668,6 +666,8 @@ uk: dormitory: Гуртожиток farm: Дім на фермі garage: Гараж + garages: Гаражі + hangar: Ангар hospital: Лікарня hotel: Будівля готелю house: Будинок @@ -681,6 +681,9 @@ uk: train_station: Будівля залізничної станції university: Університет "yes": Будівля + club: + sport: Спортивний клуб + "yes": Клуб craft: brewery: Пивоварня carpenter: Столяр @@ -1015,6 +1018,7 @@ uk: doityourself: Зроби сам dry_cleaning: Хімчистка electronics: Магазин електроніки + erotic: Еротичний Магазин estate_agent: Агентство нерухомості farm: Фермерський магазин fashion: Модний одяг @@ -1304,6 +1308,7 @@ uk: failed_to_import: 'не вдалось імпортувати. Трапилась помилка:' subject: '[OpenStreetMap] Збій імпорту GPX' gpx_success: + hi: Привіт, %{to_user}, loaded_successfully: one: успішно завантажено 1 точку з 1 можливої. few: успішно завантажено %{trace_points} точки з %{possible_points} можливих. @@ -1321,26 +1326,13 @@ uk: інформацію, щоб ви розпочали роботу. email_confirm: subject: '[OpenStreetMap] Підтвердження адреси електронної пошти' - email_confirm_plain: greeting: Привіт, hopefully_you: 'Хтось (сподіваємось, що ви) хоче змінити свою адресу електронної пошти в %{server_url} на адресу: %{new_address}.' click_the_link: Якщо це ви, будь ласка, клацніть на посилання нижче, щоб підтвердити зміни. - email_confirm_html: - greeting: Привіт, - hopefully_you: 'Хтось (сподіваємось, що ви) хоче змінити свою адресу електронної - пошти в %{server_url} на адресу: %{new_address}.' - click_the_link: Якщо це ви, клацніть на посиланню, нижче, щоб підтвердити зміни. lost_password: subject: '[OpenStreetMap] Запит на зміну пароля' - lost_password_plain: - greeting: Привіт, - hopefully_you: Хтось (сподіваємось, що ви) замовив зміну пароля для цієї адреси - електронної пошти, зареєстрованої на openstreetmap.org. - click_the_link: Якщо це ви, будь ласка, клацніть на посилання нижче, щоб змінити - свій пароль. - lost_password_html: greeting: Привіт, hopefully_you: Хтось (сподіваємось, що ви) замовив зміну пароля для цієї адреси електронної пошти, зареєстрованої на openstreetmap.org. @@ -1354,13 +1346,19 @@ uk: subject_other: '[OpenStreetMap] %{commenter} прокоментував цікаву вам нотатку' your_note: '%{commenter} залишив коментар до однієї з ваших нотаток на мапі біля %{place}.' + your_note_html: '%{commenter} залишив коментар до однієї з ваших нотаток на + мапі біля %{place}.' commented_note: '%{commenter} залишив коментар до однієї з прокоментованих вами нотаток, що знаходиться біля %{place}.' + commented_note_html: '%{commenter} залишив коментар до однієї з прокоментованих + вами нотаток, що знаходиться біля %{place}.' closed: subject_own: '[OpenStreetMap] %{commenter} опрацював одну з ваших нотаток' subject_other: '[OpenStreetMap] %{commenter} розв’язав нотатку до якови ви виявили зацікавленість' your_note: '%{commenter} опрацював одну з ваших нотаток на мапі біля %{place}.' + your_note_html: '%{commenter} опрацював одну з ваших нотаток на мапі біля + %{place}.' commented_note: '%{commenter} розв’язав нотатку, прокоментовану вами, що знаходиться біля %{place}.' reopened: @@ -1384,6 +1382,7 @@ uk: commented_changeset: '%{commenter} залишив коментар у %{time} до набору змін, що ви переглядаєте, створений %{changeset_author}' partial_changeset_with_comment: з коментарем '%{changeset_comment}' + partial_changeset_with_comment_html: з коментарем '%{changeset_comment}' partial_changeset_without_comment: без коментарів details: |2- @@ -1398,8 +1397,9 @@ uk: messages: У вас %{new_messages} і %{old_messages} new_messages: one: '%{count} нове повідомлення' - few: '%{count} нових повідомлення' - other: '%{count} нових повідомлень' + few: '%{count} нові повідомлення' + many: '%{count} нових повідомлень' + other: "" old_messages: one: '%{count} старе повідомлення' few: '%{count} старих повідомлення' @@ -1467,6 +1467,20 @@ uk: as_unread: Повідомлення позначене як непрочитане destroy: destroyed: Повідомлення вилучено + shared: + markdown_help: + title_html: Оброблено kramdown + headings: Заголовки + subheading: Підзаголовок + ordered: Впорядкований список + link: Посилання + text: Текст + image: Зображення + alt: Alt текст + url: URL + richtext_field: + edit: Редагувати + preview: Попередній перегляд site: about: next: Далі @@ -1640,16 +1654,6 @@ uk: Ви можете зробити ваші редагування загальнодоступними тут: %{user_page}.' user_page_link: сторінка користувача anon_edits_link_text: З’ясувати в чому справа. - flash_player_required_html: Для використання редактора Potlatch потрібний Flash-плеєр. - Ви можете завантажити Flash-плеєр - з Adobe.com. Існують також інші - можливості редагування даних в OpenStreetMap. - potlatch_unsaved_changes: Є незбережені зміни. (Для збереження в Potlatch зніміть - виділення з колії або точки, якщо редагуєте «вживу», або натисніть кнопку - «зберегти», якщо ви в режимі відкладеного збереження.) - potlatch2_not_configured: Потлатч 2 не був налаштований — див https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 - potlatch2_unsaved_changes: Ви маєте незбережені зміни. (Для збереження в Потлач - 2, ви повинні натиснути Зберегти.) id_not_configured: iD не був налаштований no_iframe_support: Ваш оглядач не підтримує фрейми HTML, які необхідні для цієї функції. @@ -1958,6 +1962,7 @@ uk: uploaded: 'Завантажений на сервер:' points: 'Кількість точок:' start_coordinates: 'Координати початку:' + coordinates_html: '%{latitude}; %{longitude}' map: на мапі edit: правити owner: 'Власник:' @@ -2072,7 +2077,7 @@ uk: secret: 'Секретна фраза абонента:' url: 'URL маркеру запита:' access_url: 'URL маркер доступу:' - authorize_url: 'URL автентифікації:' + authorize_url: 'URL авторизації:' support_notice: Ми підтримуємо підписи HMAC-SHA1 (рекомендується) і RSA-SHA1. edit: Змінити подробиці delete: Вилучити клієнта @@ -2606,7 +2611,7 @@ uk: javascripts: close: Закрити share: - title: Поділитись + title: Поділитися cancel: Скасувати image: Зображення link: Посилання або HTML diff --git a/config/locales/vi.yml b/config/locales/vi.yml index eb846b618..8121e8282 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -187,18 +187,12 @@ vi: other: '%{count} năm trước' editor: default: Mặc định (hiện là %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (trình vẽ trong trình duyệt) id: name: iD description: iD (trình vẽ trong trình duyệt) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (trình vẽ trong trình duyệt) remote: name: phần điều khiển từ xa - description: phần điều khiển từ xa (JOSM hoặc Merkaartor) + description: Bộ Điều khiển Từ xa (JOSM, Potlatch, Merkaartor) auth: providers: none: Không có @@ -307,6 +301,7 @@ vi: entry_html: Quan hệ %{relation_name} entry_role_html: 'Quan hệ %{relation_name} (vai trò: %{relation_role})' not_found: + title: Không Tìm thấy sorry: 'Rất tiếc, không tìm thấy %{type} #%{id}.' type: node: nốt @@ -315,6 +310,7 @@ vi: changeset: bộ thay đổi note: ghi chú timeout: + title: Lỗi Hết Thời gian Chờ sorry: Rất tiếc, đã chờ lấy dữ liệu của %{type} có ID %{id} quá lâu. type: node: nốt @@ -414,13 +410,8 @@ vi: new: title: Mục nhật ký mới form: - subject: 'Tiêu đề:' - body: 'Nội dung:' - language: 'Ngôn ngữ:' - location: 'Vị trí:' - latitude: 'VÄ© độ:' - longitude: 'Kinh độ:' - use_map_link: sá»­ dụng bản đồ + location: Vị trí + use_map_link: Sá»­ dụng Bản đồ index: title: Các nhật ký của các người dùng title_friends: Các nhật ký của bạn bè @@ -449,7 +440,8 @@ vi: body: Rất tiếc, không có mục hoặc ghi chú trong nhật ký với ID %{id}. Xin hãy kiểm tra chính tả, hoặc có lẽ bạn đã theo một liên kết sai. diary_entry: - posted_by_html: Do %{link_user} đăng vào %{created} bằng %{language_link} + posted_by_html: Do %{link_user} đăng vào %{created} bằng %{language_link}. + updated_at_html: Cập nhật lần cuối cùng vào %{updated}. comment_link: Nhận xét về mục này reply_link: Nhắn tin cho tác giả comment_count: @@ -634,6 +626,7 @@ vi: administrative: Biên giới Hành chính census: Biên giới Điều tra Dân số national_park: Vườn quốc gia + political: Biên giới Bầu cá»­ protected_area: Khu bảo tồn "yes": Biên giới bridge: @@ -653,6 +646,7 @@ vi: church: Nhà thờ college: Tòa nhà Cao đẳng commercial: Tòa nhà ThÆ°Æ¡ng mại + construction: Tòa nhà Đang Xây dormitory: Ký túc xá farm: Nông trại garage: Ga ra @@ -750,6 +744,7 @@ vi: unclassified: Ngõ "yes": Đường historic: + aircraft: Máy bay Lịch sá»­ archaeological_site: Khu vá»±c Khảo cổ battlefield: Chiến trường boundary_stone: Mốc Biên giới @@ -764,9 +759,11 @@ vi: house: Nhà ở manor: Trang viên memorial: Vật Tưởng niệm + milestone: Cột mốc Lịch sá»­ mine: Mỏ mine_shaft: Hầm Mỏ monument: Công trình Tưởng niệm + railway: Đường sắt Lịch sá»­ roman_road: Đường La Mã ruins: Tàn tích stone: Đá @@ -932,16 +929,20 @@ vi: office: accountant: Kế toán viên administrative: Công sở + advertising_agency: Văn phòng Quảng cáo architect: Kiến trúc sÆ° association: Hiệp hội company: Công ty + diplomatic: Văn phòng Ngoại giao educational_institution: Học viện employment_agency: Trung tâm Tuyển dụng estate_agent: Văn phòng Bất động sản + financial: Văn phòng Tài chính government: Văn phòng Chính phủ insurance: Văn phòng Bảo hiểm it: Văn phòng CNTT lawyer: Luật sÆ° + newspaper: Văn phòng Báo chí ngo: Văn phòng Tổ chức Phi chính phủ religion: Văn phòng Tôn giáo research: Văn phòng Nghiên cứu @@ -1017,9 +1018,11 @@ vi: car_repair: Tiệm Sá»­a Xe carpet: Tiệm Thảm charity: Cá»­a hàng Từ thiện + cheese: Tiệm Phô mai chemist: Tiệm Dược phẩm chocolate: Sô cô la clothes: Tiệm Quần áo + coffee: Tiệm Cà phê computer: Tiệm Máy tính confectionery: Tiệm Kẹo convenience: Tiệm Tiện lợi @@ -1057,15 +1060,19 @@ vi: mall: Trung tâm Mua sắm massage: Xoa bóp mobile_phone: Tiệm Điện thoại Di động + money_lender: Tiệm Mượn tiền motorcycle: Cá»­a hàng Xe mô tô music: Tiệm Nhạc + musical_instrument: Tiệm Nhạc cụ newsagent: Tiệm Báo + nutrition_supplements: Tiệm Thuốc bổ optician: Tiệm Kính mắt organic: Tiệm Thá»±c phẩm Hữu cÆ¡ outdoor: Tiệm Thể thao Ngoài trời paint: Tiệm SÆ¡n pastry: Tiệm Bánh ngọt pawnbroker: Tiệm Cầm đồ + perfumery: Tiệm Nước hoa pet: Tiệm Vật nuôi photo: Tiệm Rá»­a Hình seafood: Đổ biển @@ -1073,8 +1080,11 @@ vi: shoes: Tiệm Giày sports: Tiệm Thể thao stationery: Tiệm Văn phòng phẩm + storage_rental: Thuê Chỗ Để đồ supermarket: Siêu thị tailor: Tiệm May + tattoo: Tiệm Xăm + tea: Tiệm Trà ticket: Tiệm Vé tobacco: Tiệm Thuốc lá toys: Tiệm Đồ chÆ¡i @@ -1083,6 +1093,7 @@ vi: vacant: Tiệm Đóng cá»­a variety_store: Tiệm Tạp hóa video: Tiệm Phim + video_games: Tiệm Trò chÆ¡i Video wine: Tiệm Rượu "yes": Tiệm tourism: @@ -1131,12 +1142,15 @@ vi: "yes": Đường thủy admin_levels: level2: Biên giới Quốc gia + level3: Biên giới Miền level4: Biên giới Tỉnh bang level5: Biên giới Miền level6: Biên giới Thị xã/Quận/Huyện + level7: Biên giới Đô thị level8: Biên giới Phường/Xã/Thị trấn level9: Biên giới Làng level10: Biên giới Khu phố + level11: Biên giới Hàng xóm types: cities: Thành phố towns: Thị xã @@ -1302,11 +1316,20 @@ vi: hi: Chào %{to_user}, header: '%{from_user} đã bình luận về mục nhật ký gần đây tại OpenStreetMap với tiêu đề %{subject}:' + header_html: '%{from_user} đã bình luận về mục nhật ký gần đây tại OpenStreetMap + với tiêu đề %{subject}:' footer: Bạn cÅ©ng có thể đọc bình luận tại %{readurl}, bình luận tại %{commenturl}, hoặc nhắn tin cho tác giả tại %{replyurl} + footer_html: Bạn cÅ©ng có thể đọc bình luận tại %{readurl}, bình luận tại %{commenturl}, + hoặc nhắn tin cho tác giả tại %{replyurl} message_notification: + subject: '[OpenStreetMap] %{message_title}' hi: Chào %{to_user}, header: '%{from_user} đã gá»­i thÆ° cho bạn dùng OpenStreetMap có tiêu đề %{subject}:' + header_html: '%{from_user} đã gá»­i thÆ° cho bạn dùng OpenStreetMap có tiêu đề + %{subject}:' + footer: Bạn cÅ©ng có thể đọc tin nhắn này tại %{readurl} và có thể nhắn tin cho + tác giả tại %{replyurl} footer_html: Bạn cÅ©ng có thể đọc tin nhắn này tại %{readurl} và có thể nhắn tin cho tác giả tại %{replyurl} friendship_notification: @@ -1314,12 +1337,23 @@ vi: subject: '[OpenStreetMap] %{user} đã kết bạn với bạn' had_added_you: '%{user} đã thêm bạn vào danh sách bạn tại OpenStreetMap.' see_their_profile: Có thể xem trang cá nhân của họ tại %{userurl}. + see_their_profile_html: Có thể xem trang cá nhân của họ tại %{userurl}. befriend_them: Bạn cÅ©ng có thể thêm họ vào danh sách bạn bè của bạn tại %{befriendurl}. + befriend_them_html: Bạn cÅ©ng có thể thêm họ vào danh sách bạn bè của bạn tại + %{befriendurl}. + gpx_description: + description_with_tags_html: 'Hình nhÆ° tập tin GPX %{trace_name} của bạn có lời + miêu tả %{trace_description} và các thẻ sau: %{tags}' + description_with_no_tags_html: Hình nhÆ° tập tin GPX %{trace_name} của bạn có + lời miêu tả %{trace_description} và không có thẻ gpx_failure: + hi: Chào %{to_user}, failed_to_import: 'không nhập thành công. Đã gặp lỗi này:' + more_info_html: Tìm hiểu thêm về lỗi nhập GPX và cách tránh lỗi tại %{url}. import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures?uselang=vi subject: '[OpenStreetMap] Nhập GPX thất bại' gpx_success: + hi: Chào %{to_user}, loaded_successfully: one: '%{trace_points} điểm được tải thành công trên tổng số 1 điểm.' other: '%{trace_points} điểm được tải thành công trên tổng số %{possible_points} @@ -1336,32 +1370,18 @@ vi: thông tin về cách bắt đầu. email_confirm: subject: '[OpenStreetMap] Xác nhân địa chỉ thÆ° điện tá»­ của bạn' - email_confirm_plain: greeting: Chào bạn, hopefully_you: Ai đó (chắc bạn) muốn đổi địa chỉ thÆ° điện tá»­ bên %{server_url} thành %{new_address}. click_the_link: Nếu bạn là người đó, xin hãy nhấn chuột vào liên kết ở dưới để xác nhận thay đổi này. - email_confirm_html: - greeting: Chào bạn, - hopefully_you: Ai (chắc bạn) muốn đổi địa chỉ thÆ° điện tá»­ bên %{server_url} - thành %{new_address}. - click_the_link: Nếu bạn là người đó, xin hãy nhấn chuột vào liên kết ở dưới - để xác nhận thay đổi này. lost_password: subject: '[OpenStreetMap] Yêu cầu đặt lại mật khẩu' - lost_password_plain: greeting: Chào bạn, hopefully_you: Ai đó (chắc bạn) đã xin đặt lại mật khẩu của tài khoản openstreetmap.org có địa chỉ thÆ° điện tá»­ này. click_the_link: Nếu bạn là người đó, xin hãy nhấn chuột vào liên kết ở dưới để đặt lại mật khẩu. - lost_password_html: - greeting: Chào bạn, - hopefully_you: Ai (chắc bạn) đã xin đặt lại mật khẩu của tài khoản openstreetmap.org - có địa chỉ thÆ° điện tá»­ này. - click_the_link: Nếu bạn là người đó, xin hãy nhấn chuột vào liên kết ở dưới - để đặt lại mật khẩu. note_comment_notification: anonymous: Người dùng vô danh greeting: Chào bạn, @@ -1372,23 +1392,35 @@ vi: mà bạn đang quan tâm' your_note: '%{commenter} đã bình luận trên một ghi chú bản đồ của bạn gần %{place}.' + your_note_html: '%{commenter} đã bình luận trên một ghi chú bản đồ của bạn + gần %{place}.' commented_note: '%{commenter} đã bình luận tiếp theo bạn trên một ghi chú bản đồ gần %{place}.' + commented_note_html: '%{commenter} đã bình luận tiếp theo bạn trên một ghi + chú bản đồ gần %{place}.' closed: subject_own: '[OpenStreetMap] %{commenter} đã giải quyết một ghi chú của bạn' subject_other: '[OpenStreetMap] %{commenter} đã giải quyết một ghi chú mà bạn đang quan tâm' your_note: '%{commenter} đã giải quyết một ghi chú bản đồ của bạn gần %{place}.' + your_note_html: '%{commenter} đã giải quyết một ghi chú bản đồ của bạn gần + %{place}.' commented_note: '%{commenter} đã giải quyết một ghi chú mà bạn đã bình luận, ghi chú gần %{place}.' + commented_note_html: '%{commenter} đã giải quyết một ghi chú mà bạn đã bình + luận, ghi chú gần %{place}.' reopened: subject_own: '[OpenStreetMap] %{commenter} đã mở lại một ghi chú của bạn' subject_other: '[OpenStreetMap] %{commenter} đã mở lại một ghi chú mà bạn đang quan tâm' your_note: '%{commenter} đã mở lại một ghi chú bản đồ của bạn gần %{place}.' + your_note_html: '%{commenter} đã mở lại một ghi chú bản đồ của bạn gần %{place}.' commented_note: '%{commenter} đã mở lại một ghi chú mà bạn đã bình luận, ghi chú gần %{place}.' + commented_note_html: '%{commenter} đã mở lại một ghi chú mà bạn đã bình luận, + ghi chú gần %{place}.' details: Xem chi tiết về ghi chú tại %{url}. + details_html: Xem chi tiết về ghi chú tại %{url}. changeset_comment_notification: hi: Chào %{to_user}, greeting: Chào bạn, @@ -1399,13 +1431,21 @@ vi: mà bạn đang quan tâm' your_changeset: '%{commenter} bình luận vào %{time} về một bộ thay đổi do bạn lÆ°u' + your_changeset_html: '%{commenter} bình luận vào %{time} về một bộ thay đổi + do bạn lÆ°u' commented_changeset: '%{commenter} bình luận vào %{time} về một bộ thay đổi mà bạn đang theo dõi do %{changeset_author} lÆ°u' + commented_changeset_html: '%{commenter} bình luận vào %{time} về một bộ thay + đổi mà bạn đang theo dõi do %{changeset_author} lÆ°u' partial_changeset_with_comment: với lời bình luận “%{changeset_comment}” + partial_changeset_with_comment_html: với lời bình luận “%{changeset_comment}” partial_changeset_without_comment: không có lời bình luận details: Xem chi tiết về bộ thay đổi tại %{url}. + details_html: Xem chi tiết về bộ thay đổi tại %{url}. unsubscribe: Để ngừng nhận các thông báo về bộ thay đổi này, mở %{url} và bấm “Không theo dõi”. + unsubscribe_html: Để ngừng nhận các thông báo về bộ thay đổi này, mở %{url} + và bấm “Không theo dõi”. messages: inbox: title: Hộp thÆ° @@ -1474,6 +1514,24 @@ vi: as_unread: ThÆ° chÆ°a đọc destroy: destroyed: Đã xóa thÆ° + shared: + markdown_help: + title_html: Trang trí dùng cú pháp kramdown + headings: Đề mục + heading: Đề mục + subheading: Đề mục con + unordered: Danh sách không đánh số + ordered: Danh sách đánh số + first: Khoản mục đầu tiên + second: Khoản mục sau + link: Liên kết + text: Văn bản + image: Hình ảnh + alt: Văn bản thay thế + url: URL + richtext_field: + edit: Sá»­a đổi + preview: Xem trước site: about: next: Tiếp @@ -1650,17 +1708,6 @@ vi: phép sá»­a đổi bản đồ. Bạn có thể đưa ra công khai tại %{user_page}. user_page_link: trang cá nhân anon_edits_link_text: Tại sao vậy? - flash_player_required_html: Bạn cần có Flash Player để sá»­ dụng Potlatch, trình - vẽ OpenStreetMap bằng Flash. Bạn có thể tải - về Flash Player từ Adobe.com. CÅ©ng có sẵn vài - cách khác để sá»­a đổi OpenStreetMap. - potlatch_unsaved_changes: Bạn có thay đổi chÆ°a lÆ°u. (Để lÆ°u trong Potlatch, - hãy bỏ chọn lối hoặc địa điểm đang được chọn, nếu đến sá»­a đổi trong chế độ - Áp dụng Ngay, hoặc bấm nút LÆ°u nếu có.) - potlatch2_not_configured: Potlatch 2 chÆ°a được thiết lập. Xem thêm chi tiết - tại https://wiki.openstreetmap.org/wiki/The_Rails_Port?uselang=vi - potlatch2_unsaved_changes: Bạn chÆ°a lÆ°u một số thay đổi. (Trong Potlatch 2, - bấm nút “Save” để lÆ°u thay đổi.) id_not_configured: iD chÆ°a được cấu hình no_iframe_support: Tính năng này cần trình duyệt hỗ trợ khung nội bộ (iframe) trong HTML. @@ -1770,6 +1817,15 @@ vi: url: https://wiki.openstreetmap.org/wiki/Vi:Main_Page?uselang=vi title: Wiki OpenStreetMap description: Đọc tài liệu đầy đủ về OpenStreetMap trên wiki. + potlatch: + removed: Bạn đã đặt trình vẽ OpenStreetMap mặc định là Potlatch. Vì Adobe Flash + Player không còn được hỗ trợ, Potlatch không còn hoạt động trong trình duyệt + Web. + desktop_html: Bạn vẫn có thể sá»­ dụng Potlatch bằng cách tải + về ứng dụng về máy tính để bàn Mac hoặc Windows. + id_html: Thay thế, bạn có thể đổi trình vẽ mặc định thành iD, trình vẽ này vẫn + còn hoạt động trong trình duyệt Web của bạn giống nhÆ° Potlatch trước đây. + Thay đổi tùy chọn của bạn tại đây. sidebar: search_results: Kết quả Tìm kiếm close: Đóng diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index e2054c2ca..083cbe1bd 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -1,6 +1,7 @@ # Messages for Simplified Chinese (中文（简体）‎) # Exported from translatewiki.net # Export driver: phpyaml +# Author: )8 # Author: 500000000006城 # Author: A Chinese Wikipedian # Author: A Retired User @@ -15,6 +16,7 @@ # Author: Dimension # Author: Duolaimi # Author: Fanjiayi +# Author: Hudafu # Author: Hydra # Author: Hzy980512 # Author: Impersonator 1 @@ -23,6 +25,7 @@ # Author: Jiwei # Author: Josephine W. # Author: Koalberry +# Author: Lakejason0 # Author: LaoShuBaby # Author: Lepus # Author: Liangent @@ -42,6 +45,7 @@ # Author: VulpesVulpes825 # Author: WQL # Author: Wong128cn +# Author: Wuqianye # Author: Xiaomingyan # Author: Yfdyh000 # Author: Zazzzz @@ -61,7 +65,7 @@ zh-CN: dir: ltr time: formats: - friendly: '%Y å¹´%B %e 日 %H:%M' + friendly: '%Yå¹´%B%e日 %H:%M' blog: '%Yå¹´%B%e日' helpers: file: @@ -99,7 +103,7 @@ zh-CN: changeset_tag: 变更集标签 country: 国家 diary_comment: 日记评论 - diary_entry: 日记条目 + diary_entry: 日记文章 friend: 朋友 issue: 问题 language: 语言 @@ -228,15 +232,9 @@ zh-CN: with_name_html: '%{name} (%{id})' editor: default: 默认（目前为 %{name}） - potlatch: - name: Potlatch 1 - description: Potlatch 1 (浏览器内编辑器) id: name: iD description: iD (浏览器内编辑器) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (浏览器内编辑器) remote: name: 远程控制 description: 远程控制 (JOSM 或 Merkaartor) @@ -307,7 +305,7 @@ zh-CN: way_paginated: 路径 (%{x}-%{y}，共 %{count}) relation: 关系 (%{count}) relation_paginated: 关系 (%{x}-%{y}，共 %{count}) - comment: 评论 (%{count}) + comment: 评论（%{count}） hidden_commented_by_html: %{when}来自%{user}的隐藏评论 commented_by_html: %{when}来自%{user}的评论 changesetxml: 变更集 XML @@ -426,10 +424,10 @@ zh-CN: area: 区域 index: title: 变更集 - title_user: '%{user} 的变更集' + title_user: '%{user}的变更集' title_friend: 由我的朋友所做的变更集 title_nearby: 附近用户的变更集 - empty: 没有找到变更集。 + empty: 未找到变更集。 empty_area: 该区域内没有变更集。 empty_user: 无该用户的变更集。 no_more: 未找到更多变更集。 @@ -453,23 +451,18 @@ zh-CN: new: title: 新日记文章 form: - subject: 主题： - body: 正文： - language: 语言： - location: 位置： - latitude: 纬度： - longitude: 经度： + location: 位置 use_map_link: 使用地图 index: title: 用户日记 title_friends: 朋友的日记 title_nearby: 附近用户的日记 - user_title: '%{user} 的日记' + user_title: '%{user}的日记' in_language_title: '%{language}日记文章' new: 新日记文章 new_title: 在我的用户日记中撰写新文章 my_diary: 我的日记 - no_entries: 没有日记文章 + no_entries: 无日记文章 recent_entries: 最近的日记文章 older_entries: 较早的文章 newer_entries: 较新的文章 @@ -478,16 +471,17 @@ zh-CN: marker_text: 日记文章位置 show: title: '%{user} 的日记 | %{title}' - user_title: '%{user} 的日记' + user_title: '%{user}的日记' leave_a_comment: 留下评论 login_to_leave_a_comment_html: '%{login_link}以留下评论' login: 登录 no_such_entry: title: 没有这篇日记文章 - heading: 没有ID为 %{id} 的条目 + heading: 没有文章ID为：%{id} body: 对不起，没有 id 为 %{id} 的日记文章或评论。请检查您的拼写，或是您可能点击了错误的链接。 diary_entry: - posted_by_html: '%{link_user} 于 %{created} 以%{language_link}发表' + posted_by_html: '%{link_user}在%{created}用%{language_link}发布' + updated_at_html: 最后一次更新于%{updated}。 comment_link: 评论该文章 reply_link: 向作者发送信息 comment_count: @@ -500,7 +494,7 @@ zh-CN: confirm: 确认 report: 举报此文章 diary_comment: - comment_from_html: '%{link_user} 于 %{comment_created_at} 发表的评论' + comment_from_html: '%{link_user}在%{comment_created_at}的评论' hide_link: 隐藏此评论 unhide_link: 显示此评论 confirm: 确认 @@ -750,6 +744,7 @@ zh-CN: "yes": 建筑物 club: sport: 体育俱乐部 + "yes": 俱乐部 craft: beekeper: 养蜂人工作室 blacksmith: 铁匠铺 @@ -759,7 +754,7 @@ zh-CN: confectionery: 糖果店 dressmaker: 裁缝工作室 electrician: 电工工坊 - electronics_repair: 电子维修处 + electronics_repair: 电子产品维修 gardener: 园艺工坊 glaziery: 琉璃工坊 handicraft: 手工艺工坊 @@ -811,8 +806,8 @@ zh-CN: path: 小径 pedestrian: 步行街 platform: 车站 - primary: 一级道路 - primary_link: 一级道路 + primary: 主要道路 + primary_link: 主要道路 proposed: 规划道路 raceway: 赛道 residential: 住宅道路 @@ -926,7 +921,7 @@ zh-CN: horse_riding: 骑马运动 ice_rink: 滑冰场 marina: 小船坞 - miniature_golf: 迷您高尔夫球场 + miniature_golf: 迷你高尔夫球场 nature_reserve: 自然保护区 outdoor_seating: 户外座位 park: 公园 @@ -1215,7 +1210,7 @@ zh-CN: outdoor: 户外用品店 paint: 油漆店 pastry: 糕点店 - pawnbroker: 当铺老板 + pawnbroker: 典当行 perfumery: 香水店 pet: 宠物店 pet_grooming: 宠物美容店 @@ -1245,7 +1240,7 @@ zh-CN: "yes": 商店 tourism: alpine_hut: 高山小屋 - apartment: 假日公寓 + apartment: 度假公寓 artwork: 艺术品 attraction: 景点 bed_and_breakfast: 家庭旅馆 @@ -1258,7 +1253,7 @@ zh-CN: guest_house: 旅馆 hostel: 招待所 hotel: 酒店 - information: 信息 + information: 信息处 motel: 汽车旅馆 museum: 博物馆 picnic_site: 野餐地 @@ -1302,7 +1297,7 @@ zh-CN: towns: 城镇 places: 地点 results: - no_results: 未找到结果 + no_results: 没有找到结果 more_results: 更多结果 issues: index: @@ -1315,7 +1310,7 @@ zh-CN: search: 搜索 search_guidance: 搜索问题： user_not_found: 用户不存在 - issues_not_found: 找不到这个问题 + issues_not_found: 找不到此问题 status: 状态 reports: 举报 last_updated: 最后更新 @@ -1351,7 +1346,7 @@ zh-CN: new_reports: 新举报 other_issues_against_this_user: 其他有关此用户的问题 no_other_issues: 没有其他有关此用户的问题。 - comments_on_this_issue: 评论此问题 + comments_on_this_issue: 评论该问题 resolve: resolved: 问题状态已设置为“已解决” ignore: @@ -1424,7 +1419,7 @@ zh-CN: data: 数据 export_data: 导出数据 gps_traces: GPS 轨迹 - gps_traces_tooltip: 管理 GPS 轨迹 + gps_traces_tooltip: 管理GPS轨迹 user_diaries: 用户日记 user_diaries_tooltip: 查看用户日记 edit_with: 使用 %{editor} 编辑 @@ -1460,7 +1455,6 @@ zh-CN: header: '%{from_user} 评论了主题为 %{subject} 的 OpenStreetMap 日记文章：' footer: 您也可以通过%{readurl}来读取评论，并且在%{commenturl}来撰写评论或者通过%{replyurl}向作者发送消息 message_notification: - subject_header: '[OpenStreetMap] %{subject}' hi: 您好，%{to_user}： header: '%{from_user} 已经通过 OpenStreetMap 给您发送了一条主题为 %{subject} 的信息：' footer_html: 您还可以在%{readurl}阅读这条信息并在%{replyurl}向作者发送信息 @@ -1470,6 +1464,8 @@ zh-CN: had_added_you: '%{user} 已经在 OpenStreetMap 添加您为朋友。' see_their_profile: 您可以在%{userurl}查看他们的个人资料。 befriend_them: 您也可以在%{befriendurl}添加他们为朋友。 + gpx_description: + description_with_no_tags_html: 似乎您的GPX文件%{trace_name}，描述为%{trace_description}，没有标签 gpx_failure: failed_to_import: 导入失败。下面是错误信息： import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures @@ -1485,24 +1481,14 @@ zh-CN: welcome: 等您确认帐号后，我们将提供一些额外的信息以帮助您开始使用。 email_confirm: subject: '[OpenStreetMap] 确认您的电子邮件地址' - email_confirm_plain: greeting: 您好， hopefully_you: 有人(希望是您)想要在%{server_url}将他的电子邮件地址更改为 %{new_address}。 click_the_link: 如果这是您，请点击下面的链接以确认更改。 - email_confirm_html: - greeting: 您好， - hopefully_you: 某人(希望是您)想要更改他们的电子邮件地址 %{server_url} 为 %{new_address}。 - click_the_link: 如果这是您，请点击下面的链接以确认更改。 lost_password: subject: '[OpenStreetMap] 密码重置请求' - lost_password_plain: greeting: 您好， hopefully_you: 某人(可能是您)已要求重置该电子邮件地址上的 openstreetmap.org 帐户密码。 click_the_link: 如果这是您，请点击下面的链接重置您的密码。 - lost_password_html: - greeting: 您好， - hopefully_you: 某人(可能是您)已要求重置该电子邮件地址上的 openstreetmap.org 账户密码 - click_the_link: 如果这是您，请点击下面的链接重置您的密码。 note_comment_notification: anonymous: 匿名用户 greeting: 您好， @@ -1516,20 +1502,24 @@ zh-CN: subject_other: '[OpenStreetMap] %{commenter} 已经解决了一个您感兴趣的注记' your_note: '%{commenter} 解决了您在 %{place} 附近的一个注记。' commented_note: '%{commenter} 解决了您感兴趣的一个地图注记。该注记位于 %{place} 附近。' + commented_note_html: '%{commenter} 解决了您感兴趣的一个地图注记。该注记位于 %{place} 附近。' reopened: subject_own: '[OpenStreetMap] %{commenter} 重新激活了您的一个注记' subject_other: '[OpenStreetMap] %{commenter} 重新激活了您感兴趣的一个注记' your_note: '%{commenter} 重新激活了您在 %{place} 附近的一个注记。' commented_note: '%{commenter} 重新激活了您感兴趣的一个地图注记。该注记位于 %{place} 附近。' + commented_note_html: '%{commenter} 重新激活了您感兴趣的一个地图注记。该注记位于 %{place} 附近。' details: 更多关于笔记的详细信息可以在%{url}找到。 changeset_comment_notification: hi: 您好，%{to_user}： greeting: 您好， commented: - subject_own: '[OpenStreetMap] %{commenter}在您的一个变更集中做出了评论' + subject_own: '[OpenStreetMap] %{commenter}评论了您的一个变更集' subject_other: '[OpenStreetMap] %{commenter} 评论了您感兴趣的一个变更集' - your_changeset: '%{commenter} 于 %{time} 在您创建的一个变更集留了言' - commented_changeset: '%{commenter} 于 %{time} 在您监视的由 %{changeset_author} 创建的一个地图变更集中留了言' + your_changeset: '%{commenter}在%{time}对你的变更集留下评论' + your_changeset_html: '%{commenter} 于 %{time} 在您创建的一个变更集留下评论' + commented_changeset: '%{commenter}在%{time}对你监视的%{changeset_author}创建的变更集留下评论' + commented_changeset_html: '%{commenter}于%{time}在您监视的由%{changeset_author}创建的一个地图变更集中留下评论' partial_changeset_with_comment: 带评论“%{changeset_comment}” partial_changeset_without_comment: 没有评论 details: 更多关于变更集的详细信息可以在 %{url} 找到。 @@ -1562,7 +1552,7 @@ zh-CN: message_sent: 信息已发出 limit_exceeded: 您刚发送了很多消息。在尝试发送其他消息之前，请稍等一会儿。 no_such_message: - title: 没有此消息 + title: 无此消息 heading: 没有此消息 body: 对不起，没有具有该 id 的消息。 outbox: @@ -1598,6 +1588,23 @@ zh-CN: as_unread: 标记消息为未读 destroy: destroyed: 消息已删除 + shared: + markdown_help: + headings: 标题 + heading: 标题 + subheading: 副标题 + unordered: 无序列表 + ordered: 有序列表 + first: 第一项 + second: 第二项 + link: 链接 + text: 文字 + image: 图像 + alt: 替代文本 + url: URL + richtext_field: + edit: 编辑 + preview: 预览 site: about: next: 下一页 @@ -1640,8 +1647,8 @@ zh-CN: OpenStreetMap®æ˜¯å¼€æ”¾æ•°æ®ï¼Œç”±OpenStreetMap基金会（OSMF）采用开放数据共享开放数据库许可协议（ODbL）授权。 - intro_2_html: 只要您表明来源为 OpenStreetMap 及其贡献者，您就可以自由地复制、分发、传送和改编我们的数据。如果您想转换或者以我们的数据为基础进行创作，您只能采用相同的许可协议发表您的作品。完整的法律文本阐明了您的权利和义务。 + intro_2_html: 只要你表明来源为OpenStreetMap及其贡献者，你就可以自由地复制、分发、传送和改编我们的数据。如果你想转换或者以我们的数据为基础进行创作，你只能采用相同的许可协议发表你的作品。完整的法律文本阐明了你的权利和义务。 intro_3_1_html: 我们的文档采用知识共享 署名-相同方式共享 2.0 （CC BY-SA 2.0）许可协议授权。 credit_title_html: 如何表明作者是 OpenStreetMap @@ -1676,8 +1683,8 @@ zh-CN: contributors_au_html: |- 澳大利亚：包含来自 PSMA 澳大利亚有限公司是的资料，依据CC BY 4.0 国际澳大利亚联邦条款授权。 - contributors_ca_html: 加拿大：含有来自 GeoBase®ï¼ŒGeoGratis(© - 加拿大自然资源部)，CanVec (© 加拿大自然资源部)和StatCan (加拿大统计局地理处)的数据。 + contributors_ca_html: 加拿大：含有来自GeoBase®ï¼ŒGeoGratis（© + 加拿大自然资源部），CanVec（© 加拿大自然资源部）和StatCan（加拿大统计局地理处）的数据。 contributors_fi_html: 芬兰：包含来自芬兰国家测绘局地形数据库和其他测绘机构的数据，依据 NLSFI 协议授权。 @@ -1722,13 +1729,6 @@ zh-CN: user_page_link: 用户页面 anon_edits_html: (%{link}) anon_edits_link_text: 了解为什么这很重要。 - flash_player_required_html: 您需要 Flash Player 来使用 OpenStreetMap Flash 编辑器 Potlatch。您可以从 Adobe.com 下载 Flash Player。其他几种选择也可以用来编辑 OpenStreetMap。 - potlatch_unsaved_changes: 您有尚未保存的更改。(要在 Potlatch 中保存，如果在在线模式下编辑，您需要取消选择当前的路径或节点；或者点击保存，如果有保存按钮。) - potlatch2_not_configured: 尚未配置 Potlatch 2 - 请参阅 https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 - 以获得更多信息 - potlatch2_unsaved_changes: 您有尚未保存的更改。(要在 Potlatch 2 中保存，您应该点击保存。) id_not_configured: iD 尚未配置 no_iframe_support: 您的浏览器不支持 HTML 嵌入式框架，这是此功能所需要的。 export: @@ -1746,13 +1746,13 @@ zh-CN: advice: 如果用上面的导出工具失败了，请考虑使用下面列出的来源来导出： body: 该区域过大，不能导出为 OpenStreetMap XML 数据。请放大地图或选择一个更小的区域，或使用以下大量数据下载来源之一： planet: - title: OSM 星球 + title: OSM星球 description: 定期更新的完整 OpenStreetMap 数据库副本 overpass: title: Overpass API description: 从 OpenStreetMap 数据库的一个镜像下载此限定边框 geofabrik: - title: Geofabrik 下载 + title: Geofabrik下载 description: 定期更新的洲、 国家和特定城市的摘录 metro: title: 大都市摘录 @@ -1795,7 +1795,7 @@ zh-CN: description: 本快速指南涵盖了快速入门 OpenStreetMap 的基本知识。 beginners_guide: url: https://wiki.openstreetmap.org/wiki/Zh-hans:Beginners%27_guide - title: 初学者指南 + title: 新手指南 description: 社群维护的新手指南。 help: url: https://help.openstreetmap.org/ @@ -1833,7 +1833,7 @@ zh-CN: where_am_i: 这是哪里？ where_am_i_title: 使用搜索引擎说明当前位置 submit_text: 提交 - reverse_directions_text: 反向 + reverse_directions_text: 换向 key: table: entry: @@ -1857,7 +1857,7 @@ zh-CN: - 电车 cable: - 缆车 - - 升降椅 + - 吊椅缆车 runway: - 机场跑道 - 滑行道 @@ -1896,14 +1896,14 @@ zh-CN: summit: - 山峰 - 高峰 - tunnel: 双虚线 = 隧道 - bridge: 双实线 = æ¡¥ + tunnel: 双虚线=隧道 + bridge: 双实线=æ¡¥ private: 私人 - destination: 目标访问 + destination: 目的地进入权 construction: 在建道路 bicycle_shop: 自行车店 bicycle_parking: 自行车停车场 - toilets: 洗手间 + toilets: 厕所 richtext_area: edit: 编辑 preview: 预览 @@ -1964,14 +1964,14 @@ zh-CN: help: 帮助 help_url: http://wiki.openstreetmap.org/wiki/Upload create: - upload_trace: 上传 GPS 轨迹 + upload_trace: 上传GPS轨迹 trace_uploaded: 您的 GPX 文件已经被上传，正等待被输入数据库。这通常在半小时之内，当上传结束后会发邮件通知您。 upload_failed: 抱歉，GPX上传失败。管理员已收到错误警报。请再试一次 traces_waiting: 您有 %{count} 条轨迹正等待上传，请在上传更多轨迹前等待这些传完，以确保不会给其他用户造成队列拥堵。 edit: cancel: 取消 - title: 编辑轨迹 %{name} - heading: 编辑轨迹 %{name} + title: 编辑轨迹%{name} + heading: 编辑轨迹%{name} visibility_help: 这是什么意思？ visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces update: @@ -1979,12 +1979,12 @@ zh-CN: trace_optionals: tags: 标签 show: - title: 查看轨迹 %{name} - heading: 查看轨迹 %{name} + title: 查看轨迹%{name} + heading: 查看轨迹%{name} pending: 挂起 filename: 文件名： download: 下载 - uploaded: 上传于： + uploaded: 上传时间： points: 点： start_coordinates: 起始坐标： coordinates_html: '%{latitude}; %{longitude}' @@ -1998,9 +1998,9 @@ zh-CN: delete_trace: 删除这条轨迹 trace_not_found: 未找到轨迹！ visibility: 可见性： - confirm_delete: 删除这条轨迹么？ + confirm_delete: 删除这条轨迹？ trace_paging_nav: - showing_page: 第 %{page} 页 + showing_page: 第%{page}页 older: 较旧轨迹 newer: 较新轨迹 trace: @@ -2018,14 +2018,14 @@ zh-CN: private: 私有 trackable: 可追踪 by: 由 - in: 于 + in: 使用 map: 地图 index: - public_traces: 公开 GPS 轨迹 + public_traces: 公开GPS轨迹 my_traces: 我的GPS轨迹 public_traces_from: 来自 %{user} 的公开 GPS 轨迹 - description: 浏览最近的GPS踪迹上传 - tagged_with: 以 %{tags} 标记 + description: 浏览最近的GPS轨迹上传 + tagged_with: ' 标签为%{tags}' empty_html: 尚无轨迹。上传新轨迹或在wiki页面上了解 GPS 轨迹。 upload_trace: 上传轨迹 @@ -2172,7 +2172,7 @@ zh-CN: alt: 使用AOL OpenID登录 logout: title: 退出 - heading: 退出 OpenStreetMap + heading: 退出登录OpenStreetMap logout_button: 退出 lost_password: title: 忘记密码 @@ -2199,10 +2199,10 @@ zh-CN:

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

email address: 电子邮件地址： confirm email address: 确认电子邮件地址： - not_displayed_publicly_html: 您的地址未公开显示，请参见我们的隐私政策以获取更多信息 + not_displayed_publicly_html: 你的电子邮件地址不会被公开展示，更多信息请查看请我们的隐私政策 display name: 显示名称： - display name description: 您公开显示的用户名。您可以稍后在首选项中进行修改。 + display name description: 你的公开展示的用户名。你可以稍后在设置中进行修改。 external auth: 第三方身份验证： password: 密码： confirm password: 确认密码： @@ -2235,7 +2235,7 @@ zh-CN: italy: 意大利 rest_of_world: 世界其他地区 no_such_user: - title: 没有此用户 + title: 无此用户 heading: 用户 %{user} 不存在 body: 对不起，没有名为 %{user} 的用户。请检查您的拼写，或者可能是点击了错误的链接。 deleted: 已删除 @@ -2274,8 +2274,8 @@ zh-CN: settings_link_text: 设置 my friends: 我的朋友 no friends: 您还没有添加任何好友。 - km away: '%{count} 千米远' - m away: '%{count} 米远' + km away: '%{count}千米外' + m away: '%{count}米外' nearby users: 其他附近的用户 no nearby users: 附近没有在进行制图的用户。 role: @@ -2391,11 +2391,11 @@ zh-CN: showing: one: '%{page} 页(%{items} 的第 %{first_item} 页)' other: '%{page} 页(%{items} 的第 %{first_item} 至 %{last_item} 页)' - summary_html: '%{name} 由 %{ip_address} 于 %{date} 创建' + summary_html: '%{name}在%{date}从%{ip_address}创建' summary_no_ip_html: '%{name} 创建于 %{date}' confirm: 确认所选用户 hide: 隐藏所选用户 - empty: 没有找到匹配的用户 + empty: 未找到匹配用户 suspended: title: 帐户已暂停 heading: 帐户已暂停 @@ -2412,7 +2412,7 @@ zh-CN: auth_failure: connection_failed: 连接身份验证提供方失败 invalid_credentials: 无效的身份验证凭证 - no_authorization_code: 没有授权码 + no_authorization_code: 无授权码 unknown_signature_algorithm: 未知签名算法 invalid_scope: 无效范围 auth_association: @@ -2616,8 +2616,8 @@ zh-CN: createnote_disabled_tooltip: 放大地图以添加注记 map_notes_zoom_in_tooltip: 放大地图以查看注记 map_data_zoom_in_tooltip: 放大地图以查看数据 - queryfeature_tooltip: 查询要素 - queryfeature_disabled_tooltip: 放大以查询要素 + queryfeature_tooltip: 查询特征 + queryfeature_disabled_tooltip: 放大以查询特征 changesets: show: comment: 评论 @@ -2697,8 +2697,8 @@ zh-CN: via_point_without_exit: （通过点） follow_without_exit: 关注%{name} roundabout_without_exit: 在环形交叉驶出至%{name} - leave_roundabout_without_exit: 离开转盘 - %{name} - stay_roundabout_without_exit: 在转盘停留 - %{name} + leave_roundabout_without_exit: 离开环岛 - %{name} + stay_roundabout_without_exit: 在环岛停留 - %{name} start_without_exit: 在%{name}开始 destination_without_exit: 到达目的地 against_oneway_without_exit: '%{name}单向行驶' @@ -2724,7 +2724,7 @@ zh-CN: node: 节点 way: 路径 relation: 关系 - nothing_found: 没有找到要素 + nothing_found: 未找到要素 error: 连接 %{server} 时出错：%{error} timeout: 连接 %{server} 超时 context: @@ -2740,7 +2740,7 @@ zh-CN: heading: 编辑修订 title: 编辑修订 index: - empty: 没有可显示的修订。 + empty: 无可显示的修订。 heading: 修订列表 title: 修订列表 new: diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index a7b0b122b..1a6f31bbc 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -214,18 +214,12 @@ zh-TW: with_name_html: '%{name} (%{id})' editor: default: 預設 (目前為 %{name}) - potlatch: - name: Potlatch 1 - description: Potlatch 1 (瀏覽器內編輯) id: name: iD description: iD (瀏覽器內編輯) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (瀏覽器內編輯) remote: name: 遠端控制 - description: 遠端控制 (JOSM 或 Merkaartor) + description: 遠端控制 (JOSM、Potlatch、Merkaartor) auth: providers: none: 無 @@ -438,12 +432,7 @@ zh-TW: new: title: 新日記項目 form: - subject: 主旨： - body: 內文： - language: 語言： - location: 位置： - latitude: 緯度： - longitude: 經度： + location: 位置 use_map_link: 使用地圖 index: title: 使用者日記 @@ -1456,18 +1445,24 @@ zh-TW: subject: '[OpenStreetMap] %{user} 已評論日記項目' hi: '%{to_user} 您好，' header: '%{from_user} 評論主旨為 %{subject} 的 OpenStreetMap 日記項目：' + header_html: '%{from_user} 評論主旨為 %{subject} 的 OpenStreetMap 日記項目：' footer: 您也可以在 %{readurl} 閱讀評論，並且在 %{commenturl} 留下評論，或在 %{replyurl} 發送訊息給作者 + footer_html: 您也可以在 %{readurl} 閱讀評論，並且在 %{commenturl} 留下評論，或在 %{replyurl} 發送訊息給作者 message_notification: - subject_header: '[OpenStreetMap] %{subject}' + subject: '[OpenStreetMap] %{message_title}' hi: '%{to_user} 您好，' header: '%{from_user} 透過 OpenStreetMap 寄給您主旨為 %{subject} 的訊息：' + header_html: '%{from_user} 透過 OpenStreetMap 寄給您主旨為 %{subject} 的訊息：' + footer: 您也可以在 %{readurl} 閱讀訊息，並且在 %{replyurl} 發送訊息給作者 footer_html: 您也可以在 %{readurl} 閱讀訊息，並且在 %{replyurl} 發送訊息給作者 friendship_notification: hi: 嗨 %{to_user}， subject: '[OpenStreetMap] %{user} 將您加入為好友' had_added_you: '%{user} 已在 OpenStreetMap 將您加入為好友。' see_their_profile: 您可以在 %{userurl} 查看他的基本資料。 + see_their_profile_html: 您可以在 %{userurl} 查看他的基本資料。 befriend_them: 您可以在 %{befriendurl} 把他加入為好友。 + befriend_them_html: 您可以在 %{befriendurl} 把他加入為好友。 gpx_description: description_with_tags_html: 看起來似乎是您的 GPX 檔案%{trace_name}帶有%{trace_description}描述而且沒有標籤：%{tags} description_with_no_tags_html: 看起來似乎是您的 GPX 檔案%{trace_name}帶有%{trace_description}描述而且沒有標籤 @@ -1495,21 +1490,11 @@ zh-TW: welcome: 在確認你的帳號後，我們將提供一些額外的訊息，幫助你開始使用 OpenStreetMap。 email_confirm: subject: '[OpenStreetMap] 確認您的電子郵件地址' - email_confirm_plain: greeting: 您好， hopefully_you: 有人 (希望是您) 希望在 %{server_url} 更改電子郵件地址至 %{new_address} 。 click_the_link: 如果這是您，請按下列連結確認此變更。 - email_confirm_html: - greeting: 您好， - hopefully_you: 有人 (希望是您) 想將他的電子郵件地址 %{server_url} 改變為 %{new_address}。 - click_the_link: 如果這是您，請按下列連結確認此變更。 lost_password: subject: '[OpenStreetMap] 密碼重設要求' - lost_password_plain: - greeting: 您好， - hopefully_you: 有人 (或許是您) 要求將以此電子郵件地址註冊的 openstreetmap.org 帳號，重設密碼。 - click_the_link: 如果這是您，請按下列連結重設您的密碼。 - lost_password_html: greeting: 您好， hopefully_you: 有人 (或許是您) 要求將以此電子郵件地址註冊的 openstreetmap.org 帳號，重設密碼。 click_the_link: 如果這是您，請按下列連結重設您的密碼。 @@ -1520,18 +1505,25 @@ zh-TW: subject_own: '[OpenStreetMap] %{commenter}% 在您的註記評論' subject_other: '[OpenStreetMap] %{commenter} 就您感興趣的註記評論' your_note: '%{commenter} 在 %{place} 附近的地圖註記評論。' + your_note_html: '%{commenter} 在 %{place} 附近的地圖註記評論。' commented_note: '%{commenter} 在你感興趣的地圖註記評論。該註記在 %{place} 附近。' + commented_note_html: '%{commenter} 在你感興趣的地圖註記評論。該註記在 %{place} 附近。' closed: subject_own: '[OpenStreetMap] %{commenter} 解決你其中一筆註記 %{commenter}' subject_other: '[OpenStreetMap]%{commenter} 已經解決一筆你興趣的註記' your_note: '%{commenter} 已經解決你其中一筆接近 %{place} 的註記。' + your_note_html: '%{commenter} 已經解決你其中一筆接近 %{place} 的註記。' commented_note: '%{commenter} 已經解決一筆你留言過的地圖註記。這筆在 %{place} 附近。' + commented_note_html: '%{commenter} 已經解決一筆你留言過的地圖註記。這筆在 %{place} 附近。' reopened: subject_own: '[OpenStreetMap] %{commenter} 再次開啟你其中一筆註記。' subject_other: '[OpenStreetMap] %{commenter} 再次開啟你感興趣的註記。' your_note: '%{commenter} 已經再次開啟你其中一筆接近 %{place} 的地圖註記。' + your_note_html: '%{commenter} 已經再次開啟你其中一筆接近 %{place} 的地圖註記。' commented_note: '%{commenter} 重新開啟了一個您曾評論的地圖註記。該註記位於 %{place} 附近。' + commented_note_html: '%{commenter} 重新開啟了一個您曾評論的地圖註記。該註記位於 %{place} 附近。' details: 關於註記的更多詳細資料可在 %{url} 找到。 + details_html: 關於註記的更多詳細資料可在 %{url} 找到。 changeset_comment_notification: hi: 嗨 %{to_user}， greeting: 您好， @@ -1539,11 +1531,16 @@ zh-TW: subject_own: '[OpenStreetMap] %{commenter}% 在您的變更集評論' subject_other: '[OpenStreetMap] %{commenter} 就您感興趣的變更集評論' your_changeset: '%{commenter}於 %{time} 在您的變更集之一裡留下了評論' + your_changeset_html: '%{commenter}於 %{time} 在您的變更集之一裡留下了評論' commented_changeset: '%{commenter}於 %{time} 在您監視的由%{changeset_author}所建立變更集裡留下了評論' + commented_changeset_html: '%{commenter}於 %{time} 在您監視的由%{changeset_author}所建立變更集裡留下了評論' partial_changeset_with_comment: 評論 "%{changeset_comment}" + partial_changeset_with_comment_html: 評論 "%{changeset_comment}" partial_changeset_without_comment: 沒有評論 details: 關於變更集的詳情可在 %{url} 找到。 + details_html: 關於變更集的詳情可在 %{url} 找到。 unsubscribe: 要取消訂閱此變更集的更新內容，請訪問%{url}並點擊「取消訂閱」。 + unsubscribe_html: 要取消訂閱此變更集的更新內容，請訪問%{url}並點擊「取消訂閱」。 messages: inbox: title: 收件匣 @@ -1612,6 +1609,25 @@ zh-TW: as_unread: 訊息標記為未讀 destroy: destroyed: 訊息已刪除 + shared: + markdown_help: + title_html: 使用 kramdown + 解析 + headings: 標題 + heading: 標題 + subheading: 副標題 + unordered: 無序清單 + ordered: 有序清單 + first: 第一項 + second: 第二項 + link: 連結 + text: 文字 + image: 圖片 + alt: 替代文字 + url: 網址 + richtext_field: + edit: 編輯 + preview: 預覽 site: about: next: 下一頁 @@ -1758,14 +1774,6 @@ zh-TW: user_page_link: 使用者頁面 anon_edits_html: (%{link}) anon_edits_link_text: 瞭解為什麼這很重要。 - flash_player_required_html: 您需要 Flash player 才能使用 Potlatch，OpenStreetMap Flash - 編輯器。您可以在 Adobe.com 下載 Flash Player。還有其他許多選擇也可以編輯 OpenStreetMap。 - potlatch_unsaved_changes: 您還有未儲存的變更。 (要在 Potlatch 中儲存，您應該取消選擇目前的路徑或節點 (如果是在清單模式編輯)，或是點選儲存 - (如果有儲存按鈕)。) - potlatch2_not_configured: Potlatch 2 尚未設定 - 請參閱 https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 - 以取得更多資訊 - potlatch2_unsaved_changes: 您有未儲存的更改。 (要在 Potlatch 2 中儲存，您應按一下儲存。) id_not_configured: iD 尚未設定 no_iframe_support: 您的瀏覽器不支援 HTML 嵌入式框架，這是這項功能所必要的。 export: @@ -1860,6 +1868,11 @@ zh-TW: url: https://wiki.openstreetmap.org/ title: 開放街圖 Wiki description: 瀏覽 wiki，取得詳盡的開放街圖文件。 + potlatch: + removed: 您預設的開放街圖編輯器是設定成 Potlatch。因為 Adobe Flash Player 已終止維護，Potlatch 已不在網路瀏覽器上可用。 + desktop_html: 您仍可以透過下載適用於 Mac 與 + Windows 的桌面應用程式來使用 Potlatch。 + id_html: 除此之外，您可以設定您的預設編輯器成 iD，這可以和先前的 Potlatch 一樣，在您的網路瀏覽器上運作。在此更改您的使用者設定。 sidebar: search_results: 搜尋結果 close: 關閉 diff --git a/config/locales/zh-hk.yml b/config/locales/zh-hk.yml index ca04b3790..14e726ae9 100644 --- a/config/locales/zh-hk.yml +++ b/config/locales/zh-hk.yml @@ -149,15 +149,9 @@ zh-hk: other: '%{count}年前' editor: default: 預設（現為%{name}） - potlatch: - name: Potlatch 1 - description: Potlatch 1 (瀏覽器內的編輯器) id: name: iD description: iD (瀏覽器內的編輯器) - potlatch2: - name: Potlatch 2 - description: Potlatch 2 (瀏覽器內的編輯器) remote: name: 遙遠控制 description: 遙遠控制 (JOSM 或 Merkaartor) @@ -247,12 +241,7 @@ zh-hk: load_more: 載入更多 diary_entries: form: - subject: 主題： - body: 內文： - language: 語言： location: 位置： - latitude: 緯度： - longitude: 經度： use_map_link: 使用地圖 index: title: 用戶日記 @@ -654,20 +643,13 @@ zh-hk: friendship_notification: subject: '[OpenStreetMap] %{user} 添加了您成為好友' see_their_profile: 您可以在 %{userurl} 查看他的個人檔案。 - email_confirm_plain: - greeting: 您好， - email_confirm_html: + email_confirm: greeting: 您好， lost_password: subject: '[OpenStreetMap] 密碼重設請求' - lost_password_plain: greeting: 您好， hopefully_you: 有人 (或許是您) 要求將以此電子郵件地址註冊的openstreetmap.org帳號的密碼重設。 click_the_link: 如果是您請求的話，請按下列連結重設您的密碼。 - lost_password_html: - greeting: 您好， - hopefully_you: 有人 (或許是您) 要求將以此電子郵件地址註冊的openstreetmap.org帳號的密碼重設。 - click_the_link: 如果是您的話，請按下列連結重設您的密碼。 note_comment_notification: anonymous: 一位匿名用戶 greeting: 您好， diff --git a/config/potlatch/autocomplete.txt b/config/potlatch/autocomplete.txt deleted file mode 100644 index 39a43a844..000000000 --- a/config/potlatch/autocomplete.txt +++ /dev/null @@ -1,127 +0,0 @@ -# Potlatch autocomplete values -# each line should be: key / way|point|POI (tab) list_of_values -# '-' indicates no autocomplete for values -highway/way motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,service,bridleway,cycleway,footway,pedestrian,steps,living_street,track,road,path -highway/point mini_roundabout,traffic_signals,crossing,incline,viaduct,motorway_junction,services,ford,bus_stop,turning_circle -highway/POI bus_stop -barrier/way hedge,fence,wall,ditch -barrier/point hedge,fence,wall,ditch,bollard,cycle_barrier,cattle_grid,toll_booth,gate,stile,kissing_gate,entrance -tracktype/way grade1,grade2,grade3,grade4,grade5 -junction/way roundabout -cycleway/way lane,track,opposite_lane,opposite_track,opposite -waterway/way river,canal,stream,drain,dock,riverbank -waterway/point lock_gate,lock,turning_point,aqueduct,boatyard,water_point,waste_disposal,mooring,weir -waterway/POI boatyard,water_point,waste_disposal,mooring -railway/way rail,tram,light_rail,subway,preserved,disused,abandoned,narrow_gauge,monorail,platform -railway/point station,halt,viaduct,crossing,level_crossing,subway_entrance -railway/POI subway_entrance -aeroway/way runway,taxiway,apron -aeroway/POI aerodrome,terminal,helipad -aerialway/way cable_car,chair_lift,drag_lift -power/POI tower -power/point tower -power/way line -man_made/point works,beacon,survey_point,power_wind,power_hydro,power_fossil,power_nuclear,tower,water_tower,gasometer,reservoir_covered,lighthouse,windmill -man_made/way reservoir_covered,pier -leisure/POI sports_centre,golf_course,stadium,marina,track,pitch,water_park,fishing,nature_reserve,park,playground,garden,common,slipway -leisure/way sports_centre,golf_course,stadium,marina,track,pitch,water_park,fishing,nature_reserve,park,playground,garden,common -amenity/POI pub,biergarten,cafe,nightclub,restaurant,fast_food,parking,bicycle_parking,bicycle_rental,car_rental,car_sharing,drinking_water,fuel,telephone,toilets,recycling,public_building,place_of_worship,grave_yard,post_office,post_box,school,university,college,pharmacy,hospital,library,police,fire_station,bus_station,theatre,cinema,arts_centre,courthouse,prison,bank,bureau_de_change,atm,townhall -amenity/way parking,bicycle_parking,car_rental,car_sharing,public_building,grave_yard,school,university,college,hospital,townhall -shop/POI supermarket,convenience,bicycle,outdoor -shop/way supermarket -tourism/POI information,camp_site,caravan_site,caravan_site,picnic_site,viewpoint,theme_park,hotel,motel,guest_house,hostel,attraction,zoo -tourism/way camp_site,caravan_site,picnic_site,theme_park,attraction,zoo -historic/POI castle,monument,memorial,museum,archaeological_site,icon,ruins -historic/way archaeological_site,ruins -landuse/POI farm,quarry,landfill,basin,reservoir,forest,allotments,residential,retail,commercial,industrial,brownfield,greenfield,cemetery,village_green,recreation_ground -landuse/way farm,quarry,landfill,basin,reservoir,forest,allotments,residential,retail,commercial,industrial,brownfield,greenfield,cemetery,village_green,recreation_ground -military/POI airfield,bunker,barracks,danger_area,range -military/way airfield,barracks,danger_area,range -natural/POI spring,peak,cliff,scree,scrub,fell,heath,wood,marsh,water,coastline,mud,beach,bay,land,glacier -natural/way peak,cliff,scree,scrub,fell,heath,wood,marsh,water,coastline,mud,beach,bay,land,glacier -route/way bus,ferry,flight,ncn,subsea,ski,tour,pub_crawl -boundary/way administrative,civil,political,national_park -sport/POI 10pin,athletics,baseball,basketball,bowls,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,football,golf,gymnastics,hockey,horse_racing,motor,multi,pelota,racquet,rugby,skating,skateboard,soccer,swimming,skiing,table_tennis,tennis -sport/way 10pin,athletics,baseball,basketball,bowls,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,football,golf,gymnastics,hockey,horse_racing,motor,multi,pelota,racquet,rugby,skating,skateboard,soccer,swimming,skiing,table_tennis,tennis -abutters/way residential,retail,industrial,commercial,mixed -area/way yes -bridge/way yes -tunnel/way yes -cutting/way yes -embankment/way yes -building/way yes -lanes/way - -layer/way - -surface/way paved,unpaved,gravel,dirt,grass,cobblestone,concrete,asphalt,sand -width/way - -depth/way - -operator/way - -operator/point - -operator/POI - -access/way yes,private,permissive,unknown,no -bicycle/way yes,private,permissive,unknown,no -foot/way yes,private,permissive,unknown,no -goods/way yes,private,permissive,unknown,no -hgv/way yes,private,permissive,unknown,no -horse/way yes,private,permissive,unknown,no -motorcycle/way yes,private,permissive,unknown,no -motorcar/way yes,private,permissive,unknown,no -psv/way yes,private,permissive,unknown,no -motorboat/way yes,private,permissive,unknown,no -boat/way yes,private,permissive,unknown,no -oneway/way yes,no -maxspeed/way - -name/way - -name/point - -name/POI - -ref/way - -ref/point - -ref/POI - -ncn_ref/way - -rcn_ref/way - -lcn_ref/way - -place/POI state,region,county,city,town,village,hamlet,suburb,island -place/way state,region,county,city,town,village,hamlet,suburb,island -is_in/POI - -is_in/way - -note/point - -note/POI - -note/way - -source/point survey,Yahoo,NPE,local_knowledge,GPS,cadastre,OS7,nearmap,GeoEye,digitalglobe -source/POI survey,Yahoo,NPE,local_knowledge,GPS,cadastre,OS7,nearmap,GeoEye,digitalglobe -source/way survey,Yahoo,NPE,local_knowledge,GPS,cadastre,OS7,nearmap,GeoEye,digitalglobe -postal_code/point - -postal_code/POI - -postal_code/way - -description/point - -description/POI - -description/way - -traffic_calming/point bump,chicane,cushion,hump,rumble_strip -addr:housenumber/point - -addr:street/point - -addr:full/point - -addr:postcode/point - -addr:city/point - -addr:country/point - -addr:housenumber/POI - -addr:street/POI - -addr:full/POI - -addr:postcode/POI - -addr:city/POI - -addr:country/POI - -addr:housenumber/way - -addr:street/way - -addr:full/way - -addr:postcode/way - -addr:city/way - -addr:country/way - -addr:interpolation/way even,odd,all,alphabetic -wikipedia/POI - -wikipedia/way - -wikipedia/point - -website/POI - -website/way - -website/point - -earthquake_damage/POI no,moderate,severe,collapsed -earthquake_damage/way no,moderate,severe,collapsed -earthquake_damage/point no,moderate,severe,collapsed diff --git a/config/potlatch/colours.txt b/config/potlatch/colours.txt deleted file mode 100644 index 99883f7a5..000000000 --- a/config/potlatch/colours.txt +++ /dev/null @@ -1,37 +0,0 @@ -# Potlatch colours file -# each line must be tab-separated: tag, stroke colour, casing?, fill colour -# ** TODO: act on key=value, not just one or the other - -motorway 0x809BC0 1 - -motorway_link 0x809BC0 1 - -trunk 0x7FC97F 1 - -trunk_link 0x7FC97F 1 - -primary 0xE46D71 1 - -primary_link 0xE46D71 1 - -secondary 0xFDBF6F 1 - -secondary_link 0xFDBF6F 1 - -tertiary 0xFEFECB 1 - -tertiary_link 0xFEFECB 1 - -unclassified 0xE8E8E8 1 - -residential 0xE8E8E8 1 - -road 0xAAAAAA 1 - -footway 0xFF6644 - - -path 0xFF8866 - - -bridleway 0x996644 - - -track 0x996644 - - -cycleway 0x2222FF - - -rail 0x000001 - - -river 0x8888FF - - -canal 0x8888FF - - -stream 0x8888FF - - -leisure - - 0x8CD6B5 -amenity - - 0xADCEB5 -shop - - 0xADCEB5 -tourism - - 0xF7CECE -historic - - 0xF7F7DE -ruins - - 0xF7F7DE -landuse - - 0x444444 -military - - 0xD6D6D6 -natural - - 0xADD6A5 -sport - - 0x8CD6B5 -building - - 0xFF6EC7 diff --git a/config/potlatch/icon_presets.txt b/config/potlatch/icon_presets.txt deleted file mode 100644 index 0a2303aa8..000000000 --- a/config/potlatch/icon_presets.txt +++ /dev/null @@ -1,26 +0,0 @@ -airport aeroway=aerodrome -bus_stop highway=bus_stop -ferry_terminal amenity=ferry_terminal -parking amenity=parking -station railway=station -taxi amenity=taxi -bar amenity=bar -cafe amenity=cafe -cinema amenity=cinema -fast_food amenity=fast_food -pub amenity=pub -restaurant amenity=restaurant -theatre amenity=theatre -convenience shop=convenience -hotel tourism=hotel -pharmacy amenity=pharmacy -post_box amenity=post_box -recycling amenity=recycling -supermarket shop=supermarket -telephone amenity=telephone -fire_station amenity=fire_station -hospital amenity=hospital -police amenity=police -place_of_worship amenity=place_of_worship -museum tourism=museum -school amenity=school diff --git a/config/potlatch/locales/af.yml b/config/potlatch/locales/af.yml deleted file mode 100644 index d6348fb79..000000000 --- a/config/potlatch/locales/af.yml +++ /dev/null @@ -1,91 +0,0 @@ -# Messages for Afrikaans (Afrikaans) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: BdgwksxD -# Author: Naudefj -af: - action_cancelchanges: kanselleer veranderinge aan - action_deletepoint: Verwyder 'n punt - action_movepoint: skuif 'n punt - action_moveway: skuif 'n pad - action_waytags: stel etikette op 'n pad - advanced: Gevorderd - advanced_history: Weggeskiedenis - advanced_inspector: Inspekteur - advanced_maximise: Maksimeer venster - advanced_minimise: Minimeer venster - advanced_tooltip: Gevorderde wysigingsaksies - advanced_undelete: Rol verwydering terug - advice_uploadempty: Daar is niks om op te laai nie - advice_uploadfail: Die oplaai het gestop - advice_uploadsuccess: Al die data was suksesvol opgelaai - cancel: Kanselleer - conflict_download: Laai hul weergawe af - conflict_overwrite: Oorskryf hulle weergawe - conflict_poichanged: Sedert u met die wysiging begin het, het iemand anders punt $1$2 verander. - conflict_visitpoi: Kliek 'Ok' om die punt te wys. - conflict_visitway: Klik op 'OK' om die pad wys. - custom: "Aangepas:" - delete: Skrap - emailauthor: \n\nE-pos asseblief aan richard\@systemeD.net 'n beskrywing van wat u gedoen het. - heading_introduction: Inleiding - heading_pois: Hoe om te begin - heading_quickref: Vinnig naslaan - heading_troubleshooting: Probleemoplossing - help: Help - hint_loading: laai data - hint_saving: stoor data - hint_saving_loading: laai/stoor data - inspector: Inspekteur - inspector_locked: Op slot - inspector_node_count: ($1 keer) - inspector_uploading: (besig om op te laai) - inspector_way_connects_to_principal: Verbind $1 $2 en $3 andere $4 - login_pwd: "Wagwoord:" - login_title: Kon nie aanteken nie - login_uid: "Gebruikersnaam:" - more: Meer - "no": Nee - nobackground: Geen agtergrond - offset_motorway: Snelweg (D3) - ok: Ok - option_fadebackground: Maak agtergrond ligter - option_photo: "Foto KML:" - point: Punt - preset_icon_airport: Lughawe - preset_icon_bar: Kafee - preset_icon_bus_stop: Bushalte - preset_icon_cafe: Kafee - preset_icon_cinema: Bioskoop - preset_icon_fast_food: Kitskos - preset_icon_ferry_terminal: Veerboot - preset_icon_fire_station: Brandweerstasie - preset_icon_hospital: Hospitaal - preset_icon_hotel: Hotel - preset_icon_museum: Museum - preset_icon_parking: Parkade - preset_icon_pharmacy: Apteek - preset_icon_place_of_worship: Plek van aanbidding - preset_icon_police: Polisiestasie - preset_icon_post_box: Posbus - preset_icon_pub: Kroeg - preset_icon_restaurant: Restaurant - preset_icon_school: Skool - preset_icon_station: Treinstasie - preset_icon_supermarket: Supermark - preset_icon_telephone: Telefoon - preset_icon_theatre: Teater - prompt_changesetcomment: "Gee 'n beskrywing van u wysigings:" - prompt_helpavailable: Nuwe gebruiker? Kyk links onder vir hulp. - prompt_welcome: Welkom by OpenStreetMap! - retry: Probeer weer - revert: Rol terug - save: Stoor - tip_addtag: Voeg 'n nuwe etiket by - tip_alert: "'n Fout het voorgekom - kliek vir meer besonderhede" - tip_options: Opsies (kies die kaart agtergrond) - tip_photo: Laai foto's - uploading: Besig met oplaai... - warning: Waarskuwing! - way: Weg - "yes": Ja diff --git a/config/potlatch/locales/aln.yml b/config/potlatch/locales/aln.yml deleted file mode 100644 index 583219e0f..000000000 --- a/config/potlatch/locales/aln.yml +++ /dev/null @@ -1,229 +0,0 @@ -# Messages for Gheg Albanian (Gegë) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Mdupont -aln: - a_poi: $1 POI - a_way: $1 në mënyrë - action_addpoint: duke shtuar një nyjë në fundin e një rrugë të - action_cancelchanges: zgjidhje ndryshimet - action_changeway: ndryshime në një mënyrë të - action_createparallel: krijuar mënyra paralele - action_createpoi: krijimin e një POI - action_deletepoint: fshire pikë - action_insertnode: duke shtuar një nyje në një mënyrë - action_mergeways: bashkimi i dy mënyra - action_movepoi: lëviz një POI - action_movepoint: lëviz një pikë - action_moveway: lëviz një mënyrë - action_pointtags: tags vendosjen në një pikë - action_poitags: tags vendosjen në një POI - action_reverseway: përmbysur një mënyrë - action_revertway: U kthye një mënyrë - action_splitway: përçarje një mënyrë - action_waytags: tags vendosjen në një mënyrë të - advanced: I avancuar - advanced_close: changeset Mbylle - advanced_history: histori Way - advanced_inspector: Inspektor - advanced_maximise: dritare Maximise - advanced_minimise: dritare të minimizojë - advanced_parallel: mënyrë paralele - advanced_tooltip: redaktimi veprimet e avancuar - advanced_undelete: Undelete - advice_bendy: Too bendy të shpjegoj (SHIFT për të detyruar) - advice_conflict: konfliktit Server - ju mund të duhet të provoni përsëri kursim - advice_deletingpoi: Fshirja e POI (Z për të ndrequr) - advice_deletingway: mënyrë Fshirja (Z për të ndrequr) - advice_microblogged: Përditësuar më statusin tuaj të $1 - advice_nocommonpoint: Mënyra nuk e kanë një pikë të përbashkët - advice_revertingpoi: U kthye tek e fundit e shpëtuar POI (Z për të ndrequr) - advice_revertingway: U kthye tek e fundit e shpëtuar mënyrë (për të ndrequr Z) - advice_tagconflict: Tags nuk perputhen - ju lutem shikoni (Z për të ndrequr) - advice_toolong: Shumë e gjatë për të zhbllokuar - ju lutem ndarë në mënyrat më të shkurtër - advice_uploadempty: Asgjë për ngarkim - advice_uploadfail: Ngarko ndalur - advice_uploadsuccess: Të gjitha të dhënat ngarkua me sukses - advice_waydragged: Rruga zvarritur (Z për të ndrequr) - cancel: Anuloj - closechangeset: changeset Mbyllja - conflict_download: Shkarko versionin e tyre - conflict_overwrite: Mbishkruaj versionin e tyre - conflict_poichanged: Që ju keni filluar redaktimin, dikush tjetër ka ndryshuar pikën $1$2. - conflict_relchanged: Që ju keni filluar redaktimin, dikush tjetër ka ndryshuar në raport me $1 $2. - conflict_visitpoi: Ok 'Kliko' për të treguar në pikën. - conflict_visitway: Ok 'Kliko' për të treguar rrugën. - conflict_waychanged: Që ju keni filluar redaktimin, dikush tjetër e ka ndryshuar mënyrën $1 $2. - createrelation: Krijo një lidhje të re - custom: "Custom:" - delete: Fshij - deleting: fshirje - drag_pois: Drag dhe pikat rënie e interesit - editinglive: Editing jetojnë - editingoffline: Redaktimi në linjë - emailauthor: \n\nju lutem një biletë e hapur për http://trac.openstreetmap.org/newticket rrugën e duhur dhe të na tregoni për këtë problem - error_anonymous: Ju nuk mund të kontaktoni një përdorin mekanizmin anonim. - error_connectionfailed: Na vjen keq - lidhja me serverin OpenStreetMap dështuar. Çdo ndryshim të kohëve të fundit nuk janë ruajtur. \n\n Doni të provoni përsëri? - error_microblog_long: "Posting tek $1 dështoi:\nKodi HTTP: $2\nMesazhi Gabim: $3\ngabim $1: $4" - error_nopoi: POI nuk mund të gjenden (ndoshta ju keni panned larg?), Kështu që unë nuk mund të prish. - error_nosharedpoint: Mënyrat $1 dhe $2 nuk e ndajnë një pikë të përbashkët më, kështu që unë nuk mund të prish ndarë. - error_noway: Rruga $1 nuk mund të gjenden (ndoshta ju keni panned larg?), Kështu që unë nuk mund të prish. - error_readfailed: Na vjen keq - server OpenStreetMap nuk u përgjigjur në pyetjen për të dhënat. \n\nDoni të provoni përsëri? - existingrelation: Shto një lidhje ekzistuese - findrelation: Gjeni një raport që përmban - gpxpleasewait: Ju lutem prisni ndërkohë që pista te re është përpunuar. - heading_drawing: Vizatim - heading_introduction: Paraqitje - heading_pois: Duke filluar - heading_quickref: referencë të shpejta - heading_surveying: Studim - heading_tagging: Tagging - heading_troubleshooting: Zgjidhja - help: Ndihmë - help_html: "Mirë se vini në Potlatch\nPotlatch është redaktor e lehtë për ta përdorur për OpenStreetMap. Draw rrugët, rrugët, monumentet dhe dyqane nga anketat GPS tuaj, imazhet satelitore apo harta të vjetra.\n\nKëto faqe do të ju ndihmojë me bazat e përdorimit Potlatch, dhe t'ju them se ku mund të gjeni më shumë. Kliko titujt e mësipërme për të filluar.\n\nKur ju keni mbaruar, thjesht klikoni kudo tjetër në faqe.\n\n\n\ngjëra të dobishme të dihet\nMos kopjoni nga hartat e tjera!\n\nNëse zgjidhni 'Modifiko live', për çdo ndryshim që bëni do të shkojë në bazën e të dhënave si ju tërheq ata - si, menjëherë. Redakto Nëse ju nuk jeni aq të sigurt, të zgjedhur 'me ruajtur', dhe ata do të shkojnë vetëm në kur të shtypni \"Ruaj\".\n\nÇdo redaktimet ju bëni zakonisht do të tregohet në hartë, pas një orë ose dy (disa gjëra të marrë një javë). Jo çdo gjë është treguar në hartën - se do të duken shumë të çrregullt. Por për shkak të të dhënave OpenStreetMap është e burimit të hapur, njerëz të tjerë janë të lirë për të bërë harta që tregon aspekte të ndryshme - si OpenCycleMap ose Mesnatë Komandant .\n\nMos harroni kjo është edhe një kërkim hartë të mirë (kështu të tërheqë mjaft kthesa për bends) dhe një diagram (prandaj sigurohuni që të bashkohet në rrugë nyjet).\n\nA e kemi përmendur për të mos kopjuar nga harta e tjera?\n\n\nZbuloni më shumë\nPotlatch manual\nListat e postimeve\nOnline chat (ndihmë live)\nWeb Forumi\nKomuniteti wiki\nburim Potlatch-kod\n\n\n\nDuke filluar\nTani që ju keni Potlatch hapur, Edit klikoni 'me ruajtur' të ketë filluar.\n\nPra, ju jeni gati për të nxjerrë një hartë. Vend është më e lehtë për të filluar me vendosjen e disa pikave të interesit në hartë - ose \"POIs\". Këto mund të jenë pubs, kisha, stacione hekurudhore ... diçka që ju pëlqen.\n\nDrag and drop\nPër të bërë të super-lehtë, ju do të shihni një përzgjedhje e POIs më të zakonshme, të drejtën në fund të hartës për ju. Vendosja e një në hartë është aq e lehtë sa zvarrit atë nga atje në vendin e duhur në hartë. Dhe mos u shqetësoni nëse ju nuk merrni qëndrimin koha e duhur të parë: ju mund të zvarritet atë përsëri deri sa është e drejtë. Vini re se POI është theksuar në të verdhë për të treguar se është e zgjedhur.\n\nPasi të keni bërë këtë, ju do të dëshironi të jepni pijetore tuaj (ose kishë, ose stacion), një emër. Ju do të shihni se një tavolinë të vogël është shfaqur në fund. Një nga shënimet e do të thonë: \"emrin\" e ndjekur nga \"(shkruaj emrin e këtu)\". A se klikoni - që teksti, dhe lloji emrin.\n\nKliko në ndonjë vend tjetër në hartën për asnjërën POI tuaj, dhe të kthimit ngjyra pak panel.\n\nEasy, nuk është ajo? Kliko 'Ruaj' (poshtë djathtas), kur ju jeni bërë.\nMoving rreth\nPër të kaluar në një pjesë të ndryshme të hartës, vetëm zvarrit një zonë të zbrazët. Potlatch automatikisht do të ngarkesës së të dhënave të ri (shohim në krye të drejtë).\n\nNe i tha që të 'Modifiko me shpëtuar', por ju gjithashtu mund të klikoni 'live Edit'. Nëse ju bëni këtë, ndryshimet tuaja do të shkojnë në vijë të drejtë bazës së të dhënave, kështu që nuk ka asnjë butonin 'Ruaj'. Kjo është e mirë për ndryshime të shpejtë dhe të palëve të hartës .\n\nHapat e ardhshëm\nGëzuar me të gjithë atë? Madhe. Kliko 'Studim' më lart për të gjetur se si të bëhet një përdorin mekanizmin e vërtetë!\n\nStudim me GPS\nIdeja prapa OpenStreetMap është të bëjë një hartë, pa të drejtën e autorit kufizuese e hartave të tjera. Kjo do të thotë që ju nuk mund të kopjoni nga vende të tjera: ju duhet të shkoni dhe të sondazhi rrugët veten. Për fat të mirë, kjo është shumë e fun!\nMënyra më e mirë për të bërë këtë është me një GPS handheld caktuar. Gjeni një zonë që nuk është vendosur ende, atëherë ecin apo cikël deri në rrugë me GPS tuaj ndezur. Shënim emrat e rrugëve, dhe çdo gjë tjetër interesante (pubs? Kisha?), Si ju shkojnë së bashku.\n\nKur ju të merrni në shtëpi, GPS juaj do të përmbajë një 'tracklog' regjistrimin e kudo që ju keni qenë. Ju pastaj mund të ngarkoni këtë OpenStreetMap.\n\nLloji më e mirë e GPS është ai që të dhënat për të tracklog shpesh (çdo i dyti ose dy) dhe ka një kujtim i madh. Shumë mappers tonë përdorimit Garmins dore ose njësi pak Bluetooth. Nuk janë të detajuara GPS Shqyrtime në wiki tonë.\n\nNgarkimi rrugën tuaj\nTani, ju duhet të merrni rrugën tuaj off vendosur GPS. Ndoshta GPS juaj erdhi me disa software, apo ndoshta kjo ju lejon kopje fotografi jashtë përmes USB. Nëse jo, provoni GPSBabel . Çfarëdo, ju doni fotografi të jetë në format te re.\n\nPastaj përdor 'tab GPS Gjurmët' të ngarkoni rrugën tuaj të OpenStreetMap. Por kjo është vetëm pak më parë - ajo nuk do të shfaqet në hartë ende. Ju duhet të nxjerrë dhe emrin e rrugëve veten, duke përdorur të pista si udhëzues.\nDuke përdorur rrugën tuaj\nGjej të ngarkuar rrugën tuaj në 'Gjurmët' liste GPS, dhe klikoni 'edit' e ardhshme të drejtë për të. Potlatch do të fillojë me këtë udhë ngarkuar, plus ndonjë waypoints. Ju jeni gati për të vizatuar!\n\nJu gjithashtu mund të klikoni këtë buton për të treguar GPS gjurmët e të gjithëve (por jo waypoints) për fushën e tanishme. Mbajnë Shift për të treguar vetëm gjurmët tuaj.\nDuke përdorur fotografi satelitore\nNëse ju nuk keni një GPS, mos u shqetësoni. Në disa qytete, ne kemi fotografi satelitore ju mund të dalloj gjatë, të furnizuara me mirësi nga Yahoo! (Thanks!). Shko jashtë dhe shënim emrat e rrugëve, e pastaj të kthehen dhe gjurmë mbi linjat.\n\nNëse ju nuk e shihni imazhet satelitore, kliko butonin mundësitë dhe të Yahoo sigurt '! \" është zgjedhur. Nëse ju ende nuk e shoh ajo, ndoshta jo dispozicion për qytet e juaj apo ju mund nevojitet për të zoom out pak.\n\nNë këtë buton të njëjtën opsionet që ju do të gjeni një zgjidhje të tjera si një hartë nga-e-autorit të Britanisë së Madhe, dhe OpenTopoMap për SHBA. Këto janë të gjitha të zgjedhura enkas, sepse ne jemi të lejuar për përdorimin e tyre - nuk e kopje nga dikush tjetër e hartave ose fotot ajrore. (Ligji Copyright sucks.)\n\nNdonjëherë pics satelitore janë pak të zhvendosur nga ku rrugët janë të vërtetë. Nëse gjeni këtë, të mbajë Hapësirë dhe terhiq sfond deri sa linjat deri. Gjithmonë besimit GPS gjurmët mbi Pics satelitore.\n\nmënyra Vizatim\nPër të nxjerrë një rrugë (ose 'rrugë') duke filluar në një hapësirë bosh në hartë, vetëm të klikoni aty, e pastaj në çdo pikë në rrugë nga ana e tij. Kur ju keni mbaruar, klikoni ose shtypni Enter - pastaj klikoni në ndonjë vend tjetër për asnjërën rrugë.\n\nPër të nxjerrë një mënyrë duke filluar nga një tjetër mënyrë, klikoni këtë rrugë për të zgjedhur atë, pikat e saj do të shfaqet të kuqe. Mbajtja Shift dhe klikoni njëri prej tyre për të filluar një mënyrë të re në atë pikë. (Nëse nuk ka asnjë pikë të kuqe në kryqëzim,-turn klikoni ku ju doni një!)\n\nKliko 'Ruaj' (poshtë djathtas), kur ju jeni bërë. Ruaje shpesh, në rast serveri ka probleme.\n\nMos prisni ndryshime tuaj për të treguar menjëherë në hartë kryesore. Kjo zakonisht merr një orë ose dy, ndonjëherë deri në një javë.\nMarrja e nyjet\nËshtë me të vërtetë e rëndësishme që, kur bashkohen dy rrugë, ata kanë një pikë (ose 'nyje'). Route-planifikuesit e përdorin këtë të dinë ku të drejtohen.\n\nPotlatch kujdeset për këtë për sa kohë që ju jeni të kujdesshëm që të klikoni pikërisht në mënyrë që ju jeni bashkuar. Shiko për shenja të dobishëm: drita pikë deri blu, ndryshimet akrep, dhe kur jeni bërë, pika kryqëzim ka një skicë të zezë.\nZhvendosja e fshirjes\nKjo punon vetëm si ju do të presin që ajo të. Për të fshirë një pikë, zgjidhni atë dhe shtypni Delete. Për të fshirë një mënyrë krejt, shtyp Shift-Delete.\n\nTë lëvizë diçka, vetëm zvarrit atë. (Ju do të duhet të klikoni dhe të mbajë për një kohë të shkurtër para se të fillojë të tërheqë një mënyrë, kështu që ju nuk e bëjnë këtë nga një aksident.)\nvizatim shumë të përparuar\nNëse dy pjesët e një mënyrë kanë emra të ndryshëm, juve ju duhet të ndarë ato. Kliko rrugës, pastaj kliko në pikën ku ajo duhet të ndahet, dhe kliko gërshërë. (Ju mund të bashkojë mënyra duke klikuar me të Kontrollit, apo kyç Apple on a Mac, por nuk bashkohen dy rrugët e emrave të ndryshme ose lloje.)\n\nRoundabouts janë me të vërtetë e vështirë për të nxjerrë të drejtë. Mos u shqetësoni - Potlatch mund të ndihmojë. Vetëm barazim lak rreth, duke u siguruar të bashkohet përsëri në vetvete, në fund, pastaj klikoni tek kjo ikonë të \"pastra\" atë. (Ju mund të përdorni këtë për të sqaroj rrugëve.)\nVende me interes\nGjëja e parë që ishte mësuar se si të drag-and-drop një pikë të interesit. Ju gjithashtu mund të krijoni një me-klikuar në hartën e dyfishtë: një rreth i gjelbër duket. Por si për të thënë nëse kjo është një pijetore, një kishë apo çfarë? Kliko 'lart Tagging' për të gjetur!\n\nÇfarë lloji i rrugës është ajo?\nPasi të keni hartuar një mënyrë, ju duhet të them se çfarë është ajo. A është një rrugë e madhe, një rrugë kalimtarësh apo një lumë? Si e ka emrin e vet? A ka rregulla të veçanta (p.sh. \"nuk ka biçikleta\")?\n\nNë OpenStreetMap, ju regjistrojnë këtë duke përdorur '' tags. Një tag ka dy pjesë, dhe ju mund të ketë sa më shumë që ju pëlqen. Për shembull, ju mund të shtoni autostradë | trungu të thonë se kjo është një rrugë e madhe; | autostradës banimi për një rrugë në një pasuri të banimit, ose | rrugë këmbësore për një shteg. Nëse Bikes ishin të ndaluar, atëherë ju mund të shtoni | biçikletë nr. Pastaj për të regjistruar emrin e vet, shtoni emrin e | Rruga e Tregut.\n\nTags në Potlatch shfaqen në fund të ekranit - klikoni një rruge ekzistuese, dhe ju do të shihni se çfarë tags ka. Click the '+' shenjë (poshtë djathtas) për të shtuar një kod të ri. 'X' nga çdo tag fshin atë.\n\nJu mund tag mënyra të gjithë; pikë në mënyra të (ndoshta një portë ose një semafor), dhe pikat me interes.\nDuke përdorur tags paraprakisht\nPër t'ia filluar, Potlatch ka presets gatshme që përmban tags më popullore.\n\nZgjidhni një mënyrë, pastaj kliko me anë të simboleve derisa ju të gjeni një të përshtatshme. Pastaj, zgjidhni opsionin më të përshtatshëm nga menuja.\n\nKjo do të plotësojë tags in Disa do të lihet bosh pjesërisht kështu që ju mund të shtypni në (për shembull) emrin dhe numrin e rrugës.\nrrugë me një kalim\nJu mund të dëshironi të shtoni një etiketë si oneway | po - por se si do të thoni cilin drejtim? Ka një shigjetë në pjesën e poshtme të majtë që tregon drejtimin e rrugës së, nga fillimi në fund. Kliko atë të kundërt.\nZgjedhja tags tuaj\nSigurisht, ju nuk jeni i kufizuar në vetëm presets. Duke përdorur \"+\" button, ju mund të përdorni çdo tags në të gjitha.\n\nJu mund të shihni se çfarë tags njerëz të tjerë të përdorur në OSMdoc , dhe ka një listë të gjatë tags popullore në wiki tonë të quajtur Harta Features . Por këto janë vetëm sugjerime dhe jo rregullat. Ju jeni të lirë të shpikë tags tuaj ose të marrë hua nga të tjerët.\n\nPër shkak se të dhënat OpenStreetMap është përdorur për të bërë harta të ndryshme, çdo hartë do të tregojë (ose të 'bëjnë') zgjedhjen e vet e etiketave.\nMarrëdhëniet\nTags Ndonjëherë nuk janë të mjaftueshme, dhe keni nevojë grupi të 'dy ose më shumë mënyra. Ndoshta një kthesë është ndaluar nga një rrugë në një tjetër, ose 20 mënyra së bashku përbëjnë një rrugë të nënshkruar cikël. Ju mund ta bëni këtë me një funksion të përparuar të quajtur 'marrëdhënieve'. Gjej më shumë në wiki.\n\nShthurje gabime\nKy është zhbërë butonin (ju gjithashtu mund të shtypni Z) - kjo do prish gjëja e fundit që keni kryer.\n\nJu mund të 'rikthehet' në një kopje e ruajtur më parë të një mënyrë apo pikë. Zgjidhni atë, pastaj kliko ID e tij (numri në fund majtas) - ose shtypni H (për 'historinë'). Ju do të shihni një listë të gjithë ata që e redaktuar atë, dhe kur. Zgjidhni një të kthehem në, dhe klikoni rikthej.\n\nNëse e keni fshirë aksidentalisht një mënyrë dhe ruajtur atë: shtypni U (për 'Undelete'). Të gjitha mënyra fshihet do të shfaqet. Zgjidhni atë që dëshironi, të zhbllokuar duke klikuar dry kuqe, dhe për të shpëtuar si zakonisht.\n\nMendoni se dikush tjetër e ka bërë një gabim? Dërgo një mesazh tyre miqësore. Përdorimi opsion historisë (H) për të zgjedhur emrin e tyre, pastaj klikoni 'Mail'.\n\nPërdorimi Inspektori (në 'menu Advanced') për informacion të dobishëm në lidhje me mënyrën e tanishme ose me pikën.\nFakte\n Si mund ta shoh waypoints e mia? \nWaypoints tregojnë vetëm në qoftë se ju klikoni 'edit' me emrin udhë në 'GPS Gjurmët'. Skedari i duhet të ketë dy waypoints dhe tracklog në të - server refuzon asgjë me waypoints vetëm.\n\nFakte shumë për Potlatch dhe OpenStreetMap .\n\n\n\nDuke punuar shpejt\nNga ju jeni zoomed më tej, të dhënat më të Potlatch ka të ngarkesës. Zoom në para klikuar 'Modifiko'.\n\nstilolaps Turn off 'Përdorimi dhe dora pointers' (në dritare të opsionet) për shpejtësinë maksimale.\n\nNëse serveri po kalon ngadalë, të kthehen më vonë. Kontrollo wiki për problemet e njohur. Disa herë, si mbrëmje e diel, janë gjithmonë të zënë.\n\nTregoj Potlatch për të mësuar përmendësh vendos tuaj të preferuar e etiketave. Zgjidh një mënyrë apo pikë me ato tags, pastaj shtypni Ctrl, Shift dhe një numër nga 1 deri 9. Pastaj, për të aplikuar këto tags përsëri, vetëm shtypni Shift dhe atë numër. (Ata do të kujtohet çdo herë që përdorin Potlatch në këtë kompjuter.)\n\nTurn GPS rrugën tuaj në një mënyrë duke gjetur atë në \"listën GPS Gjurmët ', klikuar tek' edit 'nga ajo, atëherë shënoni' kthyer kutinë '. Ajo do të jetë i bllokuar (të kuqe), kështu që nuk do të shpëtojë. Edit se pari, pastaj kliko dry kuqe për të zhbllokuar kur gati për të shpëtuar.\n\nÇfarë duhet të klikoni\nDrag hartë të lëvizë.\nKlikoni dy herë për të krijuar një POI ri.\nBeqar / e-klikoni për të filluar një mënyrë të re.\nMbajtja dhe terhiq një mënyrë ose POI për të lëvizur atë.\nKur duke tërhequr një mënyrë\nDouble-click apo të shtypni Enter për të përfunduar vizatim.\nKliko një tjetër rrugë për të bërë një kryqëzim.\nKliko me Shift në fund të një tjetër rrugë për të bashkuar.\nKur një mënyrë është zgjedhur\nKliko një pikë për të zgjedhur atë.\nKliko me Shift në mënyrë për të futur një pikë e re.\nKliko me Shift një pikë për të filluar një mënyrë të re nga atje.\nKontrolli-klikoni për një mënyrë tjetër për të bashkuar.\n\nShkurtesat e tastierës\nB Shto b burim SFOND tag\nC Mbylle c hangeset\nG Trego G PS gjurmët\nH h istory Show\nUnë i nspector Show\nJ J oin pikë të kalimit mënyra\n(+Shift) Unjoin from other ways\nK k Loc / zhbllokuar zgjedhjen e tanishme\nL l atitude aktuale Trego / gjatësi\nM aximise redaktimi M dritare\nP p arallel Krijo mënyrë\nR R tags epeat\nS ave S (nëse redaktimi live)\nT T idy në vijë të drejtë / rreth\nU ndelete U (show fshirë rrugët)\nX Pritini mënyrë në dy\nZ Undo\n- Pika Hiq nga kjo mënyrë e vetme\n+ Tag Shto të re\n/ Zgjidhni një mënyrë tjetër që ndajnë këtë pikë\nFshije pikë Fshije\n (+ Shift) Fshije mënyrë të gjithë\nMbaro Kthehuni vizatim linjë\nHapësirë mbajnë dhe terhiq sfond\nESC ndërpresin shtatzëninë këtë redaktimin; ringarkim nga serveri\n0 Hiq gjithë tags\n1-9 tags Zgjidhni paraprakisht\n (+ Shift) memorizuar Zgjidhni tags\n (S + / Ctrl) tags Memorise\n§ ose `Cikli midis grupeve tag\n\n" - hint_drawmode: "klikoni për të shtuar \ndouble-click/Return pikë\nnuk e fund linjë" - hint_latlon: "gjerësi $1\ngjatësi $2" - hint_loading: ngarkim të dhënave - hint_overendpoint: mbi endpoint ($1)\nclick për t'u bashkuar\nshift-klikoni për të bashkuar - hint_overpoint: mbi pikën ($1)\nclick për t'u bashkuar - hint_pointselected: Pika e përzgjedhur\n(pikë ndryshim-klikoni për të\nlinjë nstart re) - hint_saving: ruajtje të dhënave - hint_saving_loading: ngarkim / ruajtje të dhënave - inspector: Inspektor - inspector_duplicate: Duplicate e - inspector_in_ways: Në mënyra të - inspector_latlon: "gjerësi $ 1\ngjatësi 2 $" - inspector_locked: I bllokuar - inspector_node_count: ($1 herë) - inspector_not_in_any_ways: Jo në asnjë mënyrë (POI) - inspector_unsaved: Para shpëtimit - inspector_uploading: (Ngarkimi) - inspector_way_connects_to: Lidhet tek $1 mënyra - inspector_way_connects_to_principal: Lidhet tek $1 $2 dhe $3 të tjera $4 - inspector_way_nodes: $1 nyje - inspector_way_nodes_closed: $1 nyje (mbyllur) - loading: Loading ... - login_pwd: "Fjalëkalimi:" - login_retry: faqen juaj hyrje me emrin përkatës nuk është njohur. Ju lutemi provoni përsëri. - login_title: Nuk mund të hyni në - login_uid: "Emri i përdoruesit:" - mail: Postë - more: Më shumë - newchangeset: "Ju lutemi provoni përsëri: Potlatch do të fillojë një changeset të ri." - "no": Jo - nobackground: Nuk ka sfond - norelations: Nuk marrëdhëniet në fushën e tanishme - offset_broadcanal: towpath Broad kanal - offset_choose: Zgjidhni kompensuar (m) - offset_dual: dy drejtime (D2) - offset_motorway: Autostradë (D3) - offset_narrowcanal: towpath ngushtë kanal - ok: Në rregull - openchangeset: Hapja changeset - option_custompointers: stilolaps Përdorimi dhe dora pointers - option_external: "Jashtme të nisur:" - option_fadebackground: sfond zbërdhulet - option_layer_cycle_map: OSM - Harta ciklit - option_layer_maplint: OSM - Maplint (gabime) - option_layer_nearmap: "Australi: NearMap" - option_layer_ooc_25k: "UK historik: 01:25 k" - option_layer_ooc_7th: "UK historik: 7" - option_layer_ooc_npe: "UK historik: NPE" - option_layer_ooc_scotland: "UK historik: Skoci" - option_layer_os_streetview: "Mbretëria e Bashkuar: StreetView OS" - option_layer_streets_haiti: "Haiti: emrat e rrugëve" - option_layer_surrey_air_survey: "Mbretëria e Bashkuar: Anketa Surrey Air" - option_layer_tip: Zgjidhni sfond për të shfaqur - option_limitways: Paralajmërojnë kur shumë ngarkimin e të dhënave - option_microblog_id: "Microblog Emri:" - option_microblog_pwd: "Microblog fjalëkalimin:" - option_noname: Highlight rrugëve pa emër - option_photo: "Foto KML:" - option_thinareas: Përdor linjat tretës për zonat e - option_thinlines: Përdor linjat e hollë në të gjitha shkallët e - option_tiger: Highlight tigër i pandryshuar - option_warnings: Show paralajmërime lundrues - point: Pikë - preset_icon_airport: Aeroport - preset_icon_bar: Bar - preset_icon_bus_stop: Autobusi - preset_icon_cafe: Kafene - preset_icon_cinema: Kinema - preset_icon_convenience: dyqan Lehtësi - preset_icon_disaster: ndërtimin Haiti - preset_icon_fast_food: Ushqim I shpejtë - preset_icon_ferry_terminal: Trap - preset_icon_fire_station: ndërtesë e zjarrfikësve - preset_icon_hospital: Spital - preset_icon_hotel: Hotel - preset_icon_museum: Muze - preset_icon_parking: Parking - preset_icon_pharmacy: Farmaci - preset_icon_place_of_worship: Vend i adhurimit - preset_icon_police: Stacioni policor - preset_icon_post_box: Postbox - preset_icon_pub: Pijetore - preset_icon_recycling: Riciklimit - preset_icon_restaurant: Restorant - preset_icon_school: Shkollë - preset_icon_station: Stacioni hekurudhor - preset_icon_supermarket: Supermarket - preset_icon_taxi: radhë Taxi - preset_icon_telephone: Telefon - preset_icon_theatre: Teatri - preset_tip: Zgjidhni nga një meny të përshkruar tags paraprakisht $1 - prompt_addtorelation: Shto $1 për një lidhje - prompt_changesetcomment: "Shkruani një përshkrim të ndryshimeve tuaj:" - prompt_closechangeset: changeset Mbylle $1 - prompt_createparallel: Krijo mënyrë paralele - prompt_editlive: Edit jetojnë - prompt_editsave: Edit me kurseni - prompt_helpavailable: Përdorues i ri? Shiko në pjesën e poshtme të majtë për ndihmë. - prompt_launch: Launch URL jashtme - prompt_live: Në regjimin jetojnë, çdo send që ndryshimi do të ruhen në bazën e të dhënave OpenStreetMap në çast - nuk është e rekomanduar për fillestar. A jeni i sigurt? - prompt_manyways: Kjo fushë është shumë e detajuar dhe do të marrë një kohë të gjatë për t'u ngarkuar. Do të preferonit të zoom? - prompt_microblog: Post to $1 ($2 majtas) - prompt_revertversion: "Kthehet në një kopje e ruajtur më parë:" - prompt_savechanges: Ruaj ndryshimet - prompt_taggedpoints: Disa nga pikat në këtë mënyrë janë të pajisur me etiketë ose në marrëdhënie. Really fshij? - prompt_track: Convert udhë GPS në mënyra të - prompt_unlock: Kliko për të zhbllokuar - prompt_welcome: Mirë se vini në OpenStreetMap! - retry: Rigjykoj - revert: kthe mbrapsht - save: Ruaj - tags_backtolist: Kthehu tek lista - tags_descriptions: Përshkrimet e '$1' - tags_findatag: Gjeni një tag - tags_findtag: Gjej tag - tags_matching: Popular tags matching '$1' - tags_typesearchterm: "Lloji një fjalë për të kërkuar për:" - tip_addrelation: Shto një lidhje - tip_addtag: Shto një kod të ri - tip_alert: Ka ndodhur një gabim - klikoni për detaje - tip_anticlockwise: klikoni mënyrë kundër akrepave të sahatit rrethore - të kundërt - tip_clockwise: Clockwise mënyrë rrethore - klikoni për të kthyer - tip_direction: Drejtimi i mënyrës së - klikoni për të kthyer - tip_gps: Show gjurmët GPS (G) - tip_noundo: Asgjë për të ndrequr - tip_options: options Set (zgjidhni sfond hartë) - tip_photo: Ngarko foto - tip_presettype: Zgjidhni tipin e presets ofrohen në menynë. - tip_repeattag: tags Përsëriteni nga rruga e zgjedhur më parë (R) - tip_revertversion: Zgjidhni datën ta ktheje ne - tip_selectrelation: Shtoni në rrugën e zgjedhur - tip_splitway: mënyrë të ndarë në pika të zgjedhura (X) - tip_tidy: Tidy pikë në mënyrë (T) - tip_undo: Undo $1 (Z) - uploading: Ngarkimi ... - uploading_deleting_pois: Fshirja e POIs - uploading_deleting_ways: Fshirja e mënyra - uploading_poi: Ngarkimi POI $1 - uploading_poi_name: Ngarkimi POI $1, $2 - uploading_relation: Ngarkimi i $1 lidhje - uploading_relation_name: Ngarkimi lidhje me $1, $2 - uploading_way: Ngarkimi mënyrë $1 - uploading_way_name: Ngarkimi mënyrë $1, $2 - warning: Kujdes! - way: Mënyrë - "yes": Po diff --git a/config/potlatch/locales/ar.yml b/config/potlatch/locales/ar.yml deleted file mode 100644 index 14d1d5b98..000000000 --- a/config/potlatch/locales/ar.yml +++ /dev/null @@ -1,194 +0,0 @@ -# Messages for Arabic (العربية) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Bassem JARKAS -# Author: BdgwksxD -# Author: Majid Al-Dharrab -# Author: Meno25 -# Author: Mutarjem horr -# Author: OsamaK -ar: - a_poi: $1 نقطة إهتمام ما - a_way: $1 طريق ما - action_addpoint: إضافة عقدة إلى نهاية الطريق - action_cancelchanges: جاري إلغاء التغييرات لــ - action_changeway: التغييرات على طريق - action_createparallel: إنشاء طرقات موازية - action_createpoi: إنشاء نقطة إهتمام - action_deletepoint: حذف نقطة - action_insertnode: إضافة عقدة إلى طريق - action_mergeways: دمج طريقان - action_movepoi: تحريك نقطة إهتمام - action_movepoint: تحريك نقطة - action_moveway: تحريك طريق - action_pointtags: وضع سمات على نقطة - action_poitags: وضع سمات على نقطة إهتمام - action_reverseway: عملية عكس الطريق جارية - action_revertway: عملية عكس الطريق جارية - action_splitway: تقسيم الطريق - action_waytags: وضع سمات على طريق - advanced: متقدم - advanced_close: أغلق حزمة التغييرات - advanced_history: خط التغييرات الزمني لللطريق - advanced_inspector: المدقق - advanced_maximise: كبّر النّافذة - advanced_minimise: صغّر النّافذة - advanced_parallel: طريق موازي - advanced_tooltip: أعمال تحرير متقدمة - advanced_undelete: ألغِ الحذف - advice_conflict: تضارب مع الخادم - يجب عليك محاولة الحفظ مرة ثانية - advice_deletingpoi: جاري حذف نقطة الإهتمام (Z للتراجع) - advice_deletingway: حذف الطريق (Z للتراجع) - advice_microblogged: تم تحديث حالتك $1 - advice_nocommonpoint: الطرقات لا تتقاسم نقطة مشتركة - advice_uploadempty: لا شيء للتحميل - advice_uploadfail: إيقاف التحميل - advice_uploadsuccess: تم رفع كل المعطيات بنجاح - advice_waydragged: سُحب الطريق (Z للتراجع) - cancel: ألغِ - closechangeset: إغلاق حزمة التغييرات - conflict_download: نزّل إصدارهم - conflict_overwrite: أفرض الكتابة على نسختهم - conflict_visitpoi: أنقر على الزر 'موافق' كي تشاهد النقطة. - conflict_visitway: أنقر على الزر 'موافق' لمشاهدة الطريق. - createrelation: أنشئ علاقة جديدة - custom: "مخصص:" - delete: أمحي - deleting: يجري المحو - drag_pois: سحب وإسقاط نقاط إهتمام - editinglive: تحرير مباشر - editingoffline: التحرير بدون إتصال - error_anonymous: لا تستطيع الإتصال بمُخطط مجهول. - existingrelation: أضف إلى علاقة موجودة سابقَا - findrelation: إبحث عن علاقة تحتوي - gpxpleasewait: الرجاء الإنتظار حيث يجري معالجة أثر الجي بي أس. - heading_drawing: رسم - heading_introduction: المقدمة - heading_pois: كيفية بدء العمل - heading_quickref: مرجع سريع - heading_surveying: مسح ميداني - heading_tagging: وسم - heading_troubleshooting: تعقب المشكلات - help: المساعدة - help_html: "Welcome to Potlatch\nPotlatch is the easy-to-use editor for OpenStreetMap. Draw roads, paths, landmarks and shops from your GPS surveys, satellite imagery or old maps.\n\nThese help pages will take you through the basics of using Potlatch, and tell you where to find out more. Click the headings above to begin.\n\nWhen you've finished, just click anywhere else on the page.\n\n\n\nأشياء مفيدة لتعرفها\nلا تنسخ من الخرائط الأخرى!\n\nIf you choose 'Edit live', any changes you make will go into the database as you draw them - like, immediately. If you're not so confident, choose 'Edit with save', and they'll only go in when you press 'Save'.\n\nAny edits you make will usually be shown on the map after an hour or two (a few things take a week). Not everything is shown on the map - it would look too messy. But because OpenStreetMap's data is open source, other people are free to make maps showing different aspects - like OpenCycleMap or Midnight Commander.\n\nRemember it's both a good-looking map (so draw pretty curves for bends) and a diagram (so make sure roads join at junctions).\n\nDid we mention about not copying from other maps?\n\n\nاعرف المزيد\nPotlatch manual\nقوائم بريدية\nOnline chat (live help)\nمنتدى ويب\nويكي مجتمع\nPotlatch source-code\n\n\n\nالبدء\nNow that you have Potlatch open, click 'Edit with save' to get started.\n\nSo you're ready to draw a map. The easiest place to start is by putting some points of interest on the map - or \"POIs\". These might be pubs, churches, railway stations... anything you like.\n\nاسحب واترك\nTo make it super-easy, you'll see a selection of the most common POIs, right at the bottom of the map for you. Putting one on the map is as easy as dragging it from there onto the right place on the map. And don't worry if you don't get the position right first time: you can drag it again until it's right. Note that the POI is highlighted in yellow to show that it's selected.\n\nOnce you've done that, you'll want to give your pub (or church, or station) a name. You'll see that a little table has appeared at the bottom. One of the entries will say \"name\" followed by \"(type name here)\". Do that - click that text, and type the name.\n\nClick somewhere else on the map to deselect your POI, and the colourful little panel returns.\n\nEasy, isn't it? Click 'Save' (bottom right) when you're done.\nالتحرك\nTo move to a different part of the map, just drag an empty area. Potlatch will automatically load the new data (look at the top right).\n\nWe told you to 'Edit with save', but you can also click 'Edit live'. If you do this, your changes will go into the database straightaway, so there's no 'Save' button. This is good for quick changes and mapping parties.\n\nالخطوات التالية\nHappy with all of that? Great. Click 'Surveying' above to find out how to become a real mapper!\n\nSurveying with a GPS\nThe idea behind OpenStreetMap is to make a map without the restrictive copyright of other maps. This means you can't copy from elsewhere: you must go and survey the streets yourself. Fortunately, it's lots of fun!\nThe best way to do this is with a handheld GPS set. Find an area that isn't mapped yet, then walk or cycle up the streets with your GPS switched on. Note the street names, and anything else interesting (pubs? churches?) , as you go along.\n\nWhen you get home, your GPS will contain a 'tracklog' recording everywhere you've been. You can then upload this to OpenStreetMap.\n\nThe best type of GPS is one that records to the tracklog frequently (every second or two) and has a big memory. Lots of our mappers use handheld Garmins or little Bluetooth units. There are detailed GPS Reviews on our wiki.\n\nUploading your track\nNow, you need to get your track off the GPS set. Maybe your GPS came with some software, or maybe it lets you copy the files off via USB. If not, try GPSBabel. Whatever, you want the file to be in GPX format.\n\nThen use the 'GPS Traces' tab to upload your track to OpenStreetMap. But this is only the first bit - it won't appear on the map yet. You must draw and name the roads yourself, using the track as a guide.\nUsing your track\nFind your uploaded track in the 'GPS Traces' listing, and click 'edit' right next to it. Potlatch will start with this track loaded, plus any waypoints. You're ready to draw!\n\nYou can also click this button to show everyone's GPS tracks (but not waypoints) for the current area. Hold Shift to show just your tracks.\nاستخدام صور الأقمار الصناعية\nIf you don't have a GPS, don't worry. In some cities, we have satellite photos you can trace over, kindly supplied by Yahoo! (thanks!). Go out and note the street names, then come back and trace over the lines.\n\nIf you don't see the satellite imagery, click the options button and make sure 'Yahoo!' is selected. If you still don't see it, it's probably not available for your city, or you might need to zoom out a bit.\n\nOn this same options button you'll find a few other choices like an out-of-copyright map of the UK, and OpenTopoMap for the US. These are all specially selected because we're allowed to use them - don't copy from anyone else's maps or aerial photos. (Copyright law sucks.)\n\nSometimes satellite pics are a bit displaced from where the roads really are. If you find this, hold Space and drag the background until it lines up. Always trust GPS tracks over satellite pics.\n\nرسم الطرق\nTo draw a road (or 'way') starting at a blank space on the map, just click there; then at each point on the road in turn. When you've finished, double-click or press Enter - then click somewhere else to deselect the road.\n\nTo draw a way starting from another way, click that road to select it; its points will appear red. Hold Shift and click one of them to start a new way at that point. (If there's no red point at the junction, shift-click where you want one!)\n\nClick 'Save' (bottom right) when you're done. Save often, in case the server has problems.\n\nDon't expect your changes to show instantly on the main map. It usually takes an hour or two, sometimes up to a week.\nMaking junctions\nIt's really important that, where two roads join, they share a point (or 'node'). Route-planners use this to know where to turn.\n\nPotlatch takes care of this as long as you are careful to click exactly on the way you're joining. Look for the helpful signs: the points light up blue, the pointer changes, and when you're done, the junction point has a black outline.\nالنقل والحذف\nThis works just as you'd expect it to. To delete a point, select it and press Delete. To delete a whole way, press Shift-Delete.\n\nTo move something, just drag it. (You'll have to click and hold for a short while before dragging a way, so you don't do it by accident.)\nرسم أكثر تقدما\nIf two parts of a way have different names, you'll need to split them. Click the way; then click the point where it should be split, and click the scissors. (You can merge ways by clicking with Control, or the Apple key on a Mac, but don't merge two roads of different names or types.)\n\nRoundabouts are really hard to draw right. Don't worry - Potlatch can help. Just draw the loop roughly, making sure it joins back on itself at the end, then click this icon to 'tidy' it. (You can also use this to straighten out roads.)\nنقاط الاهتمام\nThe first thing you learned was how to drag-and-drop a point of interest. You can also create one by double-clicking on the map: a green circle appears. But how to say whether it's a pub, a church or what? Click 'Tagging' above to find out!\n\nأي نوع من الطرق هو؟\nOnce you've drawn a way, you should say what it is. Is it a major road, a footpath or a river? What's its name? Are there any special rules (e.g. \"no bicycles\")?\n\nIn OpenStreetMap, you record this using 'tags'. A tag has two parts, and you can have as many as you like. For example, you could add highway | trunk to say it's a major road; highway | residential for a road on a housing estate; or highway | footway for a footpath. If bikes were banned, you could then add bicycle | no. Then to record its name, add name | Market Street.\n\nThe tags in Potlatch appear at the bottom of the screen - click an existing road, and you'll see what tags it has. Click the '+' sign (bottom right) to add a new tag. The 'x' by each tag deletes it.\n\nYou can tag whole ways; points in ways (maybe a gate or a traffic light); and points of interest.\nUsing preset tags\nTo get you started, Potlatch has ready-made presets containing the most popular tags.\n\nSelect a way, then click through the symbols until you find a suitable one. Then, choose the most appropriate option from the menu.\n\nThis will fill the tags in. Some will be left partly blank so you can type in (for example) the road name and number.\nطرق اتجاه واحد\nYou might want to add a tag like oneway | yes - but how do you say which direction? There's an arrow in the bottom left that shows the way's direction, from start to end. Click it to reverse.\nاختيار وسومك الخاصة\nOf course, you're not restricted to just the presets. By using the '+' button, you can use any tags at all.\n\nYou can see what tags other people use at OSMdoc, and there is a long list of popular tags on our wiki called Map Features. But these are only suggestions, not rules. You are free to invent your own tags or borrow from others.\n\nBecause OpenStreetMap data is used to make many different maps, each map will show (or 'render') its own choice of tags.\nعلاقات\nSometimes tags aren't enough, and you need to 'group' two or more ways. Maybe a turn is banned from one road into another, or 20 ways together make up a signed cycle route. You can do this with an advanced feature called 'relations'. Find out more on the wiki.\n\nاسترجاع الاخطاء\nThis is the undo button (you can also press Z) - it will undo the last thing you did.\n\nYou can 'revert' to a previously saved version of a way or point. Select it, then click its ID (the number at the bottom left) - or press H (for 'history'). You'll see a list of everyone who's edited it, and when. Choose the one to go back to, and click Revert.\n\nIf you've accidentally deleted a way and saved it, press U (for 'undelete'). All the deleted ways will be shown. Choose the one you want; unlock it by clicking the red padlock; and save as usual.\n\nThink someone else has made a mistake? Send them a friendly message. Use the history option (H) to select their name, then click 'Mail'.\n\nUse the Inspector (in the 'Advanced' menu) for helpful information about the current way or point.\nأسئلة متكررة\nHow do I see my waypoints?\nWaypoints only show up if you click 'edit' by the track name in 'GPS Traces'. The file has to have both waypoints and tracklog in it - the server rejects anything with waypoints alone.\n\nMore FAQs for Potlatch and OpenStreetMap.\n\n\n\nالعمل أسرع\nThe further out you're zoomed, the more data Potlatch has to load. Zoom in before clicking 'Edit'.\n\nTurn off 'Use pen and hand pointers' (in the options window) for maximum speed.\n\nIf the server is running slowly, come back later. Check the wiki for known problems. Some times, like Sunday evenings, are always busy.\n\nTell Potlatch to memorise your favourite sets of tags. Select a way or point with those tags, then press Ctrl, Shift and a number from 1 to 9. Then, to apply those tags again, just press Shift and that number. (They'll be remembered every time you use Potlatch on this computer.)\n\nTurn your GPS track into a way by finding it in the 'GPS Traces' list, clicking 'edit' by it, then tick the 'convert' box. It'll be locked (red) so won't save. Edit it first, then click the red padlock to unlock when ready to save.\n\nWhat to click\nDrag the map to move around.\nDouble-click to create a new POI.\nSingle-click to start a new way.\nHold and drag a way or POI to move it.\nWhen drawing a way\nDouble-click or press Enter to finish drawing.\nClick another way to make a junction.\nShift-click the end of another way to merge.\nWhen a way is selected\nClick a point to select it.\nShift-click in the way to insert a new point.\nShift-click a point to start a new way from there.\nControl-click another way to merge.\n\nKeyboard shortcuts\nB Add background source tag\nC Close changeset\nG Show GPS tracks\nH Show history\nI Show inspector\nJ Join point to what's below ways\n(+Shift) Unjoin from other ways\nK Lock/unlock current selection\nL Show current latitude/longitude\nM Maximise editing window\nP Create parallel way\nR Repeat tags\nS Save (unless editing live)\nT Tidy into straight line/circle\nU Undelete (show deleted ways)\nX Cut way in two\nZ Undo\n- Remove point from this way only\n+ Add new tag\n/ Select another way sharing this point\nDelete Delete point\n (+Shift) Delete entire way\nReturn Finish drawing line\nSpace Hold and drag background\nEsc Abort this edit; reload from server\n0 Remove all tags\n1-9 Select preset tags\n (+Shift) Select memorised tags\n (+S/Ctrl) Memorise tags\n§ or ` Cycle between tag groups\n\n" - hint_drawmode: "انقر لإضافة نقطة\\n\nاضغط زر /إدخال\\n لإنهاء الخط" - hint_latlon: "خط الطول $1\nخط العرض $2" - hint_loading: جاري تحميل معطيات - hint_saving: حفظ المعطيات - hint_saving_loading: جاري تحميل/حفظ معطيات - inspector: المدقق - inspector_duplicate: تكرار لـ - inspector_in_ways: في طرقات - inspector_latlon: "خط الطول $1\nخط العرض $2" - inspector_locked: مقفل - inspector_node_count: ($1 مرات) - inspector_not_in_any_ways: غير موجود في أي من الطرقات (نقاط إهتمام) - inspector_unsaved: غير محفوظ - inspector_uploading: (جاري التحميل) - inspector_way_connects_to: متصل ب‍$1 من الطرقات - inspector_way_connects_to_principal: يرتبط بــ $1 $2 و $3 غير $4 - inspector_way_nodes: $1 عقد - inspector_way_nodes_closed: $1 عقدات (مغلق) - loading: يُحمّل... - login_pwd: "كلمة السر:" - login_retry: لم يتم التعرف على تسجيلك للدخول إلى الموقع.الرجاء المحاولة مرة أخرى. - login_title: تعذّر الولوج - login_uid: "اسم المستخدم:" - mail: البريد - microblog_name_twitter: تويتر - more: المزيد - newchangeset: "الرجاء تكرار المحاولة: سيبدء Potlatch حزمة تغييرات جديدة." - "no": ﻻ - nobackground: لا خلفية - norelations: لا توجد علاقات في المنطقة الحالية - offset_motorway: الطريق السريع (D3) - ok: موافق - openchangeset: جاري فتح حزمت التغييرات - option_custompointers: استخدم المؤشر على شكل قلم وعلى شكل يد - option_external: "إطلاق خارجي:" - option_layer_cycle_map: أو أس أم - خريطة الدراجات - option_layer_streets_haiti: "هايتي : أسماء الشوارع" - option_layer_tip: إختر الخلفية اللتي تريد مشاهدتها - option_layer_yahoo: ياهو! - option_limitways: حذرني عند تحميل الكثير من البيانات - option_noname: تسليط الضوء على الطرقات غير المسمات - option_photo: "ك أم أل للصورة:" - option_thinareas: إستعمل خطوط أكثر رقة للمساحات - option_thinlines: إستعمل خطوط أرق في كل المقاييس - option_warnings: اعرض التحزيرات العائمة - point: نقطة - preset_icon_airport: مطار - preset_icon_bar: حانة - preset_icon_bus_stop: موقف حافلات - preset_icon_cafe: مقهى - preset_icon_cinema: سينما - preset_icon_convenience: بقالة - preset_icon_disaster: بناء هايتي - preset_icon_fast_food: وجبات سريعة - preset_icon_ferry_terminal: عبارة بحرية - preset_icon_fire_station: فوج إطفاء - preset_icon_hospital: مستشفى - preset_icon_hotel: فندق - preset_icon_museum: متحف - preset_icon_parking: موقف سيارات - preset_icon_pharmacy: صيدلية - preset_icon_place_of_worship: معبد - preset_icon_police: مخفر شرطة - preset_icon_post_box: صندوق بريد - preset_icon_pub: حانة - preset_icon_recycling: إعادة تصنيع - preset_icon_restaurant: مطعم - preset_icon_school: مدرسة - preset_icon_station: محطة قطار - preset_icon_supermarket: سوبرماركت - preset_icon_taxi: رتبة التاكسي - preset_icon_telephone: هاتف - preset_icon_theatre: مسرح - prompt_addtorelation: إضافة $1 إلى علاقة - prompt_changesetcomment: "أدخل وصفًا لتغييراتك:" - prompt_closechangeset: أغلق حزمة التغييرات $1 - prompt_createparallel: أنشئ طريقًا موازٍ - prompt_editlive: تحرير مباشر - prompt_editsave: عدّل مع حفظ - prompt_helpavailable: أنت مستخدم جديد ؟ أنظر في أسفل اليسار للمساعدة - prompt_launch: إطلاق رابط خارجي - prompt_manyways: تحتوي هذه المنطقة على تفاصيل كثيرة وستستغرق وقتًا طويلًا للتحميل. هل تفضل تكبير الصورة؟ - prompt_revertversion: "استرجع إلى نسخة محفوظة سابقًا:" - prompt_savechanges: احفظ التغييرات - prompt_track: حول مسارجهاز النظام العالمي لتحديد المواقع إلى طرقات - prompt_unlock: أنقر للفتح - prompt_welcome: مرحبا بكم في OpenStreetMap! - retry: أعد المحاولة - revert: استرجع - save: احفظ - tags_backtolist: الرجوع إلى اللائحة - tags_descriptions: مواصفات '$1' - tags_findatag: إبحث عن وسم - tags_findtag: إبحث عن وسم - tags_matching: الأوسمة الشعبية المطابقة لــ'$1' - tags_typesearchterm: "اكتب كلمة للبحث عنها:" - tip_addrelation: اضف إلى علاقة - tip_addtag: أضف وسم جديد - tip_alert: حدث خطأ - أنقر للحصول على التفاصيل - tip_anticlockwise: طريق دائري معاكس التجاه عقارب الساعة - انقر للعكس - tip_clockwise: طريق دائري باتجاه حركة عقارب الساعة - أنقر كي تعكسه - tip_direction: اتجاه الطريق - انقر للعكس - tip_gps: شاهد مسارات النظام العالمي لتحديد المواقع (G) - tip_noundo: لا شيء للتراجع - tip_options: تعيين خيارات (اختيار خلفية الخريطة) - tip_photo: تحميل الصور - tip_selectrelation: أضف إلى الطريق الذي تم اختياره - tip_tidy: نظف النقاط في الخط (T) - tip_undo: تراجع $1 (Z) - uploading: يرفع... - uploading_deleting_pois: محو نقاط الإهتمام - uploading_deleting_ways: حذف طرق - uploading_poi: تحميل نقطة الإهتمام $1 - uploading_poi_name: تحميل نقطة الإهتمام $1 ، $2 - uploading_relation: العلاقة $1 قيد التحميل - uploading_relation_name: تحميل العلاقة $1 ، $2 - uploading_way: تحميل الطريق $1 - uploading_way_name: تحميل الطريق $1 ، $2 - warning: تحذير! - way: طريق - "yes": نعم diff --git a/config/potlatch/locales/arz.yml b/config/potlatch/locales/arz.yml deleted file mode 100644 index aaeda88ef..000000000 --- a/config/potlatch/locales/arz.yml +++ /dev/null @@ -1,104 +0,0 @@ -# Messages for Egyptian Spoken Arabic (مصرى) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Dudi -# Author: Ghaly -# Author: Meno25 -arz: - action_cancelchanges: اللَغى بيغيّر لـ - action_createpoi: اعمل نقطة اهتمام - action_deletepoint: بيمسح نقطه - action_insertnode: زوّد node فى طريق - action_mergeways: سيّح الطريقين على بعض - action_movepoi: تحريك نقطة اهتمام - action_movepoint: تحريك نقطه - action_pointtags: ظبط tags على نقطه - action_waytags: ظبط الtags ع الطريق - advanced: متقدم - advanced_close: اقفل الchangeset - advanced_history: تاريخ الطريق - advanced_inspector: مفتش - advanced_maximise: كبّر الويندو - advanced_minimise: صغّر الويندو - advanced_parallel: طريق متوازى (parallel) - advanced_undelete: الغى المسح - advice_uploadempty: ما فيش حاجه يرفعها (upload) - cancel: كانسيل - closechangeset: بيقفل الchangeset - createrelation: اعمل علاقه جديده - custom: "مخصوص:" - delete: امسح - deleting: بيمسح - editinglive: تعديل اونلاين - findrelation: دوّر على علاقه فيها - heading_drawing: رسم - heading_introduction: مقدمه - heading_quickref: مراجعه سريعه - heading_tagging: بيعمل tag - heading_troubleshooting: اقتل المشكله - help: مساعده - help_html: "Welcome to Potlatch\nPotlatch is the easy-to-use editor for OpenStreetMap. Draw roads, paths, landmarks and shops from your GPS surveys, satellite imagery or old maps.\n\nThese help pages will take you through the basics of using Potlatch, and tell you where to find out more. Click the headings above to begin.\n\nWhen you've finished, just click anywhere else on the page.\n\n\n\nحاجات مفيده علشان تعرفها\nما تنسخش من الخرايط التانيه!\n\nIf you choose 'Edit live', any changes you make will go into the database as you draw them - like, immediately. If you're not so confident, choose 'Edit with save', and they'll only go in when you press 'Save'.\n\nAny edits you make will usually be shown on the map after an hour or two (a few things take a week). Not everything is shown on the map - it would look too messy. But because OpenStreetMap's data is open source, other people are free to make maps showing different aspects - like OpenCycleMap or Midnight Commander.\n\nRemember it's both a good-looking map (so draw pretty curves for bends) and a diagram (so make sure roads join at junctions).\n\nDid we mention about not copying from other maps?\n\n\nاعرف اكتر\nPotlatch manual\nليسَت الميل\nOnline chat (live help)\nWeb forum\nمجتمع الويكى\nPotlatch source-code\n\n\n\nلسه مبتدى\nNow that you have Potlatch open, click 'Edit with save' to get started.\n\nSo you're ready to draw a map. The easiest place to start is by putting some points of interest on the map - or \"POIs\". These might be pubs, churches, railway stations... anything you like.\n\nDrag & drop\nTo make it super-easy, you'll see a selection of the most common POIs, right at the bottom of the map for you. Putting one on the map is as easy as dragging it from there onto the right place on the map. And don't worry if you don't get the position right first time: you can drag it again until it's right. Note that the POI is highlighted in yellow to show that it's selected.\n\nOnce you've done that, you'll want to give your pub (or church, or station) a name. You'll see that a little table has appeared at the bottom. One of the entries will say \"name\" followed by \"(type name here)\". Do that - click that text, and type the name.\n\nClick somewhere else on the map to deselect your POI, and the colourful little panel returns.\n\nEasy, isn't it? Click 'Save' (bottom right) when you're done.\nاتمشّا\nTo move to a different part of the map, just drag an empty area. Potlatch will automatically load the new data (look at the top right).\n\nWe told you to 'Edit with save', but you can also click 'Edit live'. If you do this, your changes will go into the database straightaway, so there's no 'Save' button. This is good for quick changes and mapping parties.\n\nالخطوات الجايّه\nHappy with all of that? Great. Click 'Surveying' above to find out how to become a real mapper!\n\nSurveying with a GPS\nThe idea behind OpenStreetMap is to make a map without the restrictive copyright of other maps. This means you can't copy from elsewhere: you must go and survey the streets yourself. Fortunately, it's lots of fun!\nThe best way to do this is with a handheld GPS set. Find an area that isn't mapped yet, then walk or cycle up the streets with your GPS switched on. Note the street names, and anything else interesting (pubs? churches?) , as you go along.\n\nWhen you get home, your GPS will contain a 'tracklog' recording everywhere you've been. You can then upload this to OpenStreetMap.\n\nThe best type of GPS is one that records to the tracklog frequently (every second or two) and has a big memory. Lots of our mappers use handheld Garmins or little Bluetooth units. There are detailed GPS Reviews on our wiki.\n\nUploading your track\nNow, you need to get your track off the GPS set. Maybe your GPS came with some software, or maybe it lets you copy the files off via USB. If not, try GPSBabel. Whatever, you want the file to be in GPX format.\n\nThen use the 'GPS Traces' tab to upload your track to OpenStreetMap. But this is only the first bit - it won't appear on the map yet. You must draw and name the roads yourself, using the track as a guide.\nUsing your track\nFind your uploaded track in the 'GPS Traces' listing, and click 'edit' right next to it. Potlatch will start with this track loaded, plus any waypoints. You're ready to draw!\n\nYou can also click this button to show everyone's GPS tracks (but not waypoints) for the current area. Hold Shift to show just your tracks.\nاستعمل صور الساتالايتات\nIf you don't have a GPS, don't worry. In some cities, we have satellite photos you can trace over, kindly supplied by Yahoo! (thanks!). Go out and note the street names, then come back and trace over the lines.\n\nIf you don't see the satellite imagery, click the options button and make sure 'Yahoo!' is selected. If you still don't see it, it's probably not available for your city, or you might need to zoom out a bit.\n\nOn this same options button you'll find a few other choices like an out-of-copyright map of the UK, and OpenTopoMap for the US. These are all specially selected because we're allowed to use them - don't copy from anyone else's maps or aerial photos. (Copyright law sucks.)\n\nSometimes satellite pics are a bit displaced from where the roads really are. If you find this, hold Space and drag the background until it lines up. Always trust GPS tracks over satellite pics.\n\nرسم الطرق\nTo draw a road (or 'way') starting at a blank space on the map, just click there; then at each point on the road in turn. When you've finished, double-click or press Enter - then click somewhere else to deselect the road.\n\nTo draw a way starting from another way, click that road to select it; its points will appear red. Hold Shift and click one of them to start a new way at that point. (If there's no red point at the junction, shift-click where you want one!)\n\nClick 'Save' (bottom right) when you're done. Save often, in case the server has problems.\n\nDon't expect your changes to show instantly on the main map. It usually takes an hour or two, sometimes up to a week.\nMaking junctions\nIt's really important that, where two roads join, they share a point (or 'node'). Route-planners use this to know where to turn.\n\nPotlatch takes care of this as long as you are careful to click exactly on the way you're joining. Look for the helpful signs: the points light up blue, the pointer changes, and when you're done, the junction point has a black outline.\nالنقل و المسح\nThis works just as you'd expect it to. To delete a point, select it and press Delete. To delete a whole way, press Shift-Delete.\n\nTo move something, just drag it. (You'll have to click and hold for a short while before dragging a way, so you don't do it by accident.)\nرسم متقدم اكتر\nIf two parts of a way have different names, you'll need to split them. Click the way; then click the point where it should be split, and click the scissors. (You can merge ways by clicking with Control, or the Apple key on a Mac, but don't merge two roads of different names or types.)\n\nRoundabouts are really hard to draw right. Don't worry - Potlatch can help. Just draw the loop roughly, making sure it joins back on itself at the end, then click this icon to 'tidy' it. (You can also use this to straighten out roads.)\nنقط الاهتمام\nThe first thing you learned was how to drag-and-drop a point of interest. You can also create one by double-clicking on the map: a green circle appears. But how to say whether it's a pub, a church or what? Click 'Tagging' above to find out!\n\nايه نوع الطريق ده؟\nOnce you've drawn a way, you should say what it is. Is it a major road, a footpath or a river? What's its name? Are there any special rules (e.g. \"no bicycles\")?\n\nIn OpenStreetMap, you record this using 'tags'. A tag has two parts, and you can have as many as you like. For example, you could add highway | trunk to say it's a major road; highway | residential for a road on a housing estate; or highway | footway for a footpath. If bikes were banned, you could then add bicycle | no. Then to record its name, add name | Market Street.\n\nThe tags in Potlatch appear at the bottom of the screen - click an existing road, and you'll see what tags it has. Click the '+' sign (bottom right) to add a new tag. The 'x' by each tag deletes it.\n\nYou can tag whole ways; points in ways (maybe a gate or a traffic light); and points of interest.\nUsing preset tags\nTo get you started, Potlatch has ready-made presets containing the most popular tags.\n\nSelect a way, then click through the symbols until you find a suitable one. Then, choose the most appropriate option from the menu.\n\nThis will fill the tags in. Some will be left partly blank so you can type in (for example) the road name and number.\nطرق اتجاه واحد\nYou might want to add a tag like oneway | yes - but how do you say which direction? There's an arrow in the bottom left that shows the way's direction, from start to end. Click it to reverse.\nاختار الtags بتاعتك\nOf course, you're not restricted to just the presets. By using the '+' button, you can use any tags at all.\n\nYou can see what tags other people use at OSMdoc, and there is a long list of popular tags on our wiki called Map Features. But these are only suggestions, not rules. You are free to invent your own tags or borrow from others.\n\nBecause OpenStreetMap data is used to make many different maps, each map will show (or 'render') its own choice of tags.\nعلاقات\nSometimes tags aren't enough, and you need to 'group' two or more ways. Maybe a turn is banned from one road into another, or 20 ways together make up a signed cycle route. You can do this with an advanced feature called 'relations'. Find out more on the wiki.\n\nارجع فى الغلطات\nThis is the undo button (you can also press Z) - it will undo the last thing you did.\n\nYou can 'revert' to a previously saved version of a way or point. Select it, then click its ID (the number at the bottom left) - or press H (for 'history'). You'll see a list of everyone who's edited it, and when. Choose the one to go back to, and click Revert.\n\nIf you've accidentally deleted a way and saved it, press U (for 'undelete'). All the deleted ways will be shown. Choose the one you want; unlock it by clicking the red padlock; and save as usual.\n\nThink someone else has made a mistake? Send them a friendly message. Use the history option (H) to select their name, then click 'Mail'.\n\nUse the Inspector (in the 'Advanced' menu) for helpful information about the current way or point.\nاسئله بتتسئل كتير\nHow do I see my waypoints?\nWaypoints only show up if you click 'edit' by the track name in 'GPS Traces'. The file has to have both waypoints and tracklog in it - the server rejects anything with waypoints alone.\n\nMore FAQs for Potlatch and OpenStreetMap.\n\n\n\nتشغيل اسرع\nThe further out you're zoomed, the more data Potlatch has to load. Zoom in before clicking 'Edit'.\n\nTurn off 'Use pen and hand pointers' (in the options window) for maximum speed.\n\nIf the server is running slowly, come back later. Check the wiki for known problems. Some times, like Sunday evenings, are always busy.\n\nTell Potlatch to memorise your favourite sets of tags. Select a way or point with those tags, then press Ctrl, Shift and a number from 1 to 9. Then, to apply those tags again, just press Shift and that number. (They'll be remembered every time you use Potlatch on this computer.)\n\nTurn your GPS track into a way by finding it in the 'GPS Traces' list, clicking 'edit' by it, then tick the 'convert' box. It'll be locked (red) so won't save. Edit it first, then click the red padlock to unlock when ready to save.\n\nWhat to click\nDrag the map to move around.\nDouble-click to create a new POI.\nSingle-click to start a new way.\nHold and drag a way or POI to move it.\nWhen drawing a way\nDouble-click or press Enter to finish drawing.\nClick another way to make a junction.\nShift-click the end of another way to merge.\nWhen a way is selected\nClick a point to select it.\nShift-click in the way to insert a new point.\nShift-click a point to start a new way from there.\nControl-click another way to merge.\n\nKeyboard shortcuts\nB Add background source tag\nC Close changeset\nG Show GPS tracks\nH Show history\nI Show inspector\nJ Join point to what's below ways\n(+Shift) Unjoin from other ways\nK Lock/unlock current selection\nL Show current latitude/longitude\nM Maximise editing window\nP Create parallel way\nR Repeat tags\nS Save (unless editing live)\nT Tidy into straight line/circle\nU Undelete (show deleted ways)\nX Cut way in two\nZ Undo\n- Remove point from this way only\n+ Add new tag\n/ Select another way sharing this point\nDelete Delete point\n (+Shift) Delete entire way\nReturn Finish drawing line\nSpace Hold and drag background\nEsc Abort this edit; reload from server\n0 Remove all tags\n1-9 Select preset tags\n (+Shift) Select memorised tags\n (+S/Ctrl) Memorise tags\n§ or ` Cycle between tag groups\n\n" - hint_latlon: "خط الطول $1\nخط العرض $2" - hint_loading: تحميل بيانات - hint_saving: بيسييڤ الداتا - hint_saving_loading: جارى تحميل/حفظ الداتا - inspector: مفتش - inspector_latlon: "خط الطول $1\nخط العرض $2" - inspector_locked: مقفول - inspector_unsaved: مش متسييڤه - inspector_uploading: (رفع/uploading) - login_pwd: "پاسوورد:" - login_title: ما قدرش يسجل دخول - login_uid: "اسم اليوزر:" - mail: رسايل - more: اكتر - "no": لأ - nobackground: ما فيش خلفيه - offset_motorway: هاى-ويى (Highway)‏ (D3) - ok: اوكى - openchangeset: بيفتح الchangeset - option_layer_cycle_map: OSM - خريطة البيسكيليته - point: نقطه - preset_icon_airport: مطار - preset_icon_bar: بار - preset_icon_bus_stop: موقف اوتوبيس - preset_icon_cafe: كافيه - preset_icon_cinema: سينما - preset_icon_fast_food: Fast food - preset_icon_ferry_terminal: عبّاره (ferry) - preset_icon_fire_station: محطة مطافى - preset_icon_hospital: مستشفى - preset_icon_hotel: لوكانده - preset_icon_museum: متحف - preset_icon_parking: پاركينج - preset_icon_pharmacy: اجزاخانه - preset_icon_place_of_worship: مكان العباده - preset_icon_police: نقطة بوليس - preset_icon_post_box: بوسطه - preset_icon_pub: Pub - preset_icon_restaurant: ريستوران - preset_icon_school: مدرَسه - preset_icon_station: محطة قطر - preset_icon_supermarket: سوبرماركت - preset_icon_taxi: رتبة التاكسى - preset_icon_telephone: تليفون - preset_icon_theatre: تياترو - prompt_changesetcomment: "دخّل وصف لتغييراتك:" - prompt_editlive: تعديل ع الهوا - prompt_editsave: عدّل و سييڤ - prompt_helpavailable: يوزر جديد؟ بُص تحت ع الشمال علشان المساعده - prompt_launch: اعمل launch لـ URL برّانى - prompt_revertversion: "ارجع لنسخه متسييڤه قبل كده:" - prompt_savechanges: سييڤ التغييرات - prompt_welcome: اهلا بيكو فى OpenStreetMap! - retry: حاول تانى - revert: رجّع - save: سييڤ - tip_options: اظبط الاوپشنز (اختار خلفية الخريطه) - tip_photo: اعمل load للصور - tip_undo: ارجع $1 (Z) - uploading: بيرفع... (Uploading...) - uploading_deleting_ways: بيمسح الطرق - warning: تحذير! - way: طريق - "yes": اه diff --git a/config/potlatch/locales/ast.yml b/config/potlatch/locales/ast.yml deleted file mode 100644 index 3eeb24e8d..000000000 --- a/config/potlatch/locales/ast.yml +++ /dev/null @@ -1,228 +0,0 @@ -# Messages for Asturian (Asturianu) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Xuacu -ast: - a_poi: $1 un PDI - a_way: $1 una vía - action_addpoint: amestando un nodu al final d'una vía - action_cancelchanges: encaboxando los cambeos a - action_changeway: cambeos nuna vía - action_createparallel: creando víes paraleles - action_createpoi: creando un PDI - action_deletepoint: desaniciando un puntu - action_insertnode: amestando un nodu a una vía - action_mergeways: amestando dos víes - action_movepoi: moviendo un PDI - action_movepoint: moviendo un puntu - action_moveway: moviendo una vía - action_pointtags: conseñar etiquetes nun puntu - action_poitags: conseñar etiquetes nun PDI - action_reverseway: invertiendo una vía - action_revertway: invertir una vía - action_splitway: xebrando una vía - action_waytags: conseñar etiquetes nuna vía - advanced: Avanzao - advanced_close: Zarrar conxuntu de cambeos - advanced_history: Historial de la vía - advanced_inspector: Inspector - advanced_maximise: Maximizar ventana - advanced_minimise: Amenorgar ventana - advanced_parallel: Vía paralela - advanced_tooltip: Aiciones d'edición avanzaes - advanced_undelete: Des-desaniciar - advice_bendy: Enforma curváu pa enderechar (Mayús pa forzar) - advice_conflict: Conflictu nel sirvidor - tendrás que volver a guardar, seique - advice_deletingpoi: Desaniciando PDI (Z pa desfacer) - advice_deletingway: Desaniciando vía (Z pa desfacer) - advice_microblogged: S'anovó'l to estáu $1 - advice_nocommonpoint: Les víes nun tienen un puntu común - advice_revertingpoi: Tornando al caberu PDI guardáu (Z pa desfacer) - advice_revertingway: Tornando a la cabera vía guardada (Z pa desfacer) - advice_tagconflict: Les etiquetes nun concasen - comprobales (Z pa desfacer) - advice_toolong: Demasiao llargo pa desbloquiar - xebralo en víes más curties - advice_uploadempty: Ren que xubir - advice_uploadfail: Xubida parada - advice_uploadsuccess: Tolos datos se xubieron de mou correutu - advice_waydragged: Vía arrastrada (Z pa desfacer) - cancel: Encaboxar - closechangeset: Zarrando conxuntu de cambeos - conflict_download: Descargar versión ayena - conflict_overwrite: Sobroscribir la versión ayena - conflict_poichanged: Dende qu'entamasti la edición dalguién más camudó el puntu $1$2. - conflict_relchanged: Dende qu'entamasti la edición, dalguién más camudó la rellación $1$2. - conflict_visitpoi: Calca "Aceutar" p'amosar el puntu. - conflict_visitway: Calca "Aceutar" p'amosar la vía. - conflict_waychanged: Dende qu'entamasti la edición, dalguién más camudó la vía $1$2. - createrelation: Crear una rellación nueva - custom: "Personalizáu:" - delete: Desaniciar - deleting: desaniciando - drag_pois: Arrastrar y soltar puntos d'interés - editinglive: Editando en vivo - editingoffline: Editando con guardáu - emailauthor: \n\nPor favor, manda un corréu a richard@systemeD.net con un informe de fallu diciendo lo que tabes faciendo nesi momentu. - error_anonymous: Nun pues comunicate con un mapeador anónimu. - error_connectionfailed: Perdón - la conexón col sirvidor OpenStreetMap falló. Dellos cambeos recientes nun se guardaron.\n\n¿Quedríes volver a tentalo? - error_microblog_long: "Falló espublizar en $1:\nCódigu HTTP: $2\nMensaxe d'error: $3\nError $1: $4" - error_nopoi: El PDI nun se pue alcontrar (¿movisti'l mapa, seique?) y, poro, nun puedo desfacer. - error_nosharedpoint: Les víes $1 y $2 yá nun comparten un puntu común, y poro, nun puedo desfacer la dixebra. - error_noway: La vía $1 nun se pue alcontrar (¿movisti'l mapa, seique?) y, poro, nun puedo desfacer. - error_readfailed: Lo siento - el sirvidor d'OpenStreetMap nun respondió al pidí-y datos.\n\n¿Quies tentalo otra vuelta? - existingrelation: Amestar a una rellación esistente - findrelation: Alcontrar una rellación que contién - gpxpleasewait: Espera mientres se procesa la traza GPX. - heading_drawing: Dibuxando - heading_introduction: Presentación - heading_pois: Primeros pasos - heading_quickref: Referencia rápida - heading_surveying: Mapeando - heading_tagging: Etiquetáu - heading_troubleshooting: Identificar fallos - help: Ayuda - hint_drawmode: calca p'amestar puntu\ndoble-click/Intro\npa finar llinia - hint_latlon: "lla $1\nllo $2" - hint_loading: cargando datos - hint_overendpoint: nel puntu final ($1)\ncalcar pa xunir\nmay-calcar p'amestar - hint_overpoint: sobro'l puntu ($1)\ncalca pa xuntar - hint_pointselected: puntu seleicionáu\n(mayús-calcar nel puntu\np'aniciar llinia) - hint_saving: guardando datos - hint_saving_loading: cargando/guardando datos - inspector: Inspector - inspector_duplicate: Duplicáu de - inspector_in_ways: En víes - inspector_latlon: "Lla $1\nLlo $2" - inspector_locked: Candáu - inspector_node_count: ($1 veces) - inspector_not_in_any_ways: Nun ta en denguna vía (PDI) - inspector_unsaved: Ensin guardar - inspector_uploading: (xubiendo) - inspector_way_connects_to: Coneuta con $1 víes - inspector_way_connects_to_principal: Coneuta con $1 $2 y $3 $4 más - inspector_way_nodes: $1 nodos - inspector_way_nodes_closed: $1 nodos (zarráu) - loading: Cargando... - login_pwd: "Contraseña:" - login_retry: Nun se reconoció la to conexón al sitiu. Por favor, tentalo otra vuelta. - login_title: Nun se pudo coneutar - login_uid: "Nome d'usuariu:" - mail: Corréu - more: Más - newchangeset: "Vuelve a tentalo: Potlatch aniciará un conxuntu de cambeos nuevu." - "no": Non - nobackground: Ensin fondu - norelations: Nun hai rellaciones nel área actual - offset_broadcanal: Camín anchu de remolque de canal - offset_choose: Escoyer separación (m) - offset_dual: Doble calzada (D2) - offset_motorway: Autopista (D3) - offset_narrowcanal: Camín estrechu de remolque de canal - ok: Aceutar - openchangeset: Abriendo conxuntu de cambeos - option_custompointers: Usar los punteros llápiz y mano - option_external: "Llanzar esternu:" - option_fadebackground: Fondu dilíu - option_layer_cycle_map: OSM - cycle map - option_layer_maplint: OSM - Maplint (errores) - option_layer_nearmap: "Australia: NearMap" - option_layer_ooc_25k: "UK históricu: 1:25k" - option_layer_ooc_7th: "UK históricu: 7th" - option_layer_ooc_npe: "UK históricu: NPE" - option_layer_ooc_scotland: "UK históricu: Escocia" - option_layer_os_streetview: "UK: OS StreetView" - option_layer_streets_haiti: "Haití: nomes de calle" - option_layer_surrey_air_survey: "UK: Surrey Air Survey" - option_layer_tip: Escueyi'l fondu a amosar - option_limitways: Avisar si se carguen munchos datos - option_microblog_id: "Nome de microblog:" - option_microblog_pwd: Contraseña de microblog - option_noname: Rescamplar carreteres ensin nome - option_photo: "KML de la semeya:" - option_thinareas: Usar llinies más fines pa les árees - option_thinlines: Usar llinies fines en toles escales - option_tiger: Rescamplar TIGER ensin cambeos - option_warnings: Amosar avisos flotantes - point: Puntu - preset_icon_airport: Aeropuertu - preset_icon_bar: Bar - preset_icon_bus_stop: Parada d'autobús - preset_icon_cafe: Café - preset_icon_cinema: Cine - preset_icon_convenience: Alimentación - preset_icon_disaster: Edificiu d'Haití - preset_icon_fast_food: Comida rápida - preset_icon_ferry_terminal: Ferry - preset_icon_fire_station: Bomberos - preset_icon_hospital: Hospital - preset_icon_hotel: Hotel - preset_icon_museum: Muséu - preset_icon_parking: Aparcaderu - preset_icon_pharmacy: Farmacia - preset_icon_place_of_worship: Llugar de cultu - preset_icon_police: Comisaría - preset_icon_post_box: Buzón - preset_icon_pub: Pub - preset_icon_recycling: Reciclax - preset_icon_restaurant: Restaurante - preset_icon_school: Escuela - preset_icon_station: Estación de tren - preset_icon_supermarket: Supermercáu - preset_icon_taxi: Parada de taxis - preset_icon_telephone: Teléfonu - preset_icon_theatre: Teatru - preset_tip: Esbillar d'un menú d'etiquetes preconfiguraes que describen $1 - prompt_addtorelation: Amestar $1 a una rellación - prompt_changesetcomment: "Escribi una descripción de los cambeos:" - prompt_closechangeset: Zarrar conxuntu de cambeos $1 - prompt_createparallel: Crear vía paralela - prompt_editlive: Editar en vivo - prompt_editsave: Editar con guardáu - prompt_helpavailable: ¿Usuariu nuevu? Mira l'ayuda abaxo a manzorga. - prompt_launch: Llanzar URL esterna - prompt_live: Nel mou en vivo, cada elementu que camudes de guardará nel intre na base de datos d'OpenStreetMap - nun ta recomendao pa principiantes. ¿Tas seguru? - prompt_manyways: Esti ye un área con munchos detalles y llevará tiempu enforma cargala. ¿Preferiríes ampliala? - prompt_microblog: Mandar corréu a $1 (queden $2) - prompt_revertversion: "Tornar a una versión anterior guardada:" - prompt_savechanges: Guardar cambeos - prompt_taggedpoints: Dellos puntos d'esta vía tienen etiquetes o tan en rellaciones. ¿Desaniciar de veres? - prompt_track: Convertir traza GPS a víes - prompt_unlock: Calca pa desbloquiar - prompt_welcome: ¡Bienllegaos a OpenStreetMap! - retry: Volver a tentalo - revert: Revertir - save: Guardar - tags_backtolist: Tornar a la llista - tags_descriptions: Descripciones de "$1" - tags_findatag: Alcontrar una etiqueta - tags_findtag: Alcontrar etiqueta - tags_matching: Etiquetes populares que casen con "$1" - tags_typesearchterm: "Escribi una pallabra pa guetar:" - tip_addrelation: Amestar a una rellación - tip_addtag: Amestar etiqueta nueva - tip_alert: Hebo un error - calca pa más detalles - tip_anticlockwise: Vía circular en sentíu anti-horariu, calca pa invertir - tip_clockwise: Vía circular en sentíu horariu, calca pa invertir - tip_direction: Direición de la vía - calca pa invertir - tip_gps: Amosar traces GPS (G) - tip_noundo: Ren que desfacer - tip_options: Afitar opciones (escoyer el fondu del mapa) - tip_photo: Cargar semeyes - tip_presettype: Escueye les opciones preconfiguraes que s'ufren nel menú. - tip_repeattag: Repetir les etiquetes de la vía seleicionada anteriormente (R) - tip_revertversion: Escueyi a qué data tornar - tip_selectrelation: Amestar a la ruta escoyía - tip_splitway: Xebrar vía nel puntu seleicionáu (X) - tip_tidy: Iguar los puntos d'una vía (T) - tip_undo: Desfacer $1 (Z) - uploading: Xubiendo… - uploading_deleting_pois: Desaniciando PDIs - uploading_deleting_ways: Desaniciando víes - uploading_poi: Xubiendo'l PDI $1 - uploading_poi_name: Xubiendo'l PDI $1, $2 - uploading_relation: Xubiendo la rellación $1 - uploading_relation_name: Xubiendo la rellación $1, $2 - uploading_way: Xubiendo la vía $1 - uploading_way_name: Xubiendo la vía $1, $2 - warning: ¡Avisu! - way: Vía - "yes": Sí diff --git a/config/potlatch/locales/be-Tarask.yml b/config/potlatch/locales/be-Tarask.yml deleted file mode 100644 index e4a5f21f5..000000000 --- a/config/potlatch/locales/be-Tarask.yml +++ /dev/null @@ -1,229 +0,0 @@ -# Messages for Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: EugeneZelenko -# Author: Jim-by -be-TARASK: - a_poi: $1 пункт інтарэсу - a_way: $1 дарогу - action_addpoint: даданьне пункту ў канец дарогі - action_cancelchanges: скасаваньне зьменаў да - action_changeway: зьмены дарогі - action_createparallel: стварыць паралельныя дарогі - action_createpoi: стварэньне пункту інтарэсу - action_deletepoint: выдаленьне пункту - action_insertnode: даданьне пункту на дарогу - action_mergeways: аб'яднаньне двух дарогаў - action_movepoi: перанос пункту інтарэсу - action_movepoint: перамяшчэньне пункту - action_moveway: перанос дарогі - action_pointtags: устаноўка тэгаў на пункты - action_poitags: устаноўка тэгаў на пункт інтарэсу - action_reverseway: зьмена напрамку дарогі - action_revertway: вяртаньне дарогі - action_splitway: падзел дарогі - action_waytags: устаноўка тэгаў на дарогу - advanced: Палепшанае мэню - advanced_close: Закрыць набор зьменаў - advanced_history: Гісторыя дарогі - advanced_inspector: Інспэктар - advanced_maximise: Разгарнуць акно - advanced_minimise: Згарнуць акно - advanced_parallel: Паралельная дарога - advanced_tooltip: Дзеяньні палепшанага рэдагаваньня - advanced_undelete: Аднавіць - advice_bendy: Занадта выгнутае каб выпраміць (SHIFT каб выпраміць) - advice_conflict: Канфлікт на сэрвэры. Верагодна, Вам неабходна паўторнае захаваньне - advice_deletingpoi: Выдаленьне пункту інтарэсу (Z для адмены) - advice_deletingway: Выдаленьне дарогі (Z для адмены) - advice_microblogged: "Ваш статус абноўлены: $1" - advice_nocommonpoint: Дарогі ня маюць агульнага пункту - advice_revertingpoi: Вяртаньне да апошняга захаванага пункту інтарэсу (Z для адмены) - advice_revertingway: Вяртаньне да апошняй захаванай вэрсіі (Z для адмены) - advice_tagconflict: Тэгі не супадаюць. Калі ласка, праверце (Z для адмены) - advice_toolong: Занадта доўгая для разблякваньня. Калі ласка, падзяліце на больш кароткія дарогі - advice_uploadempty: Няма чаго загружаць - advice_uploadfail: Загрузка спыненая - advice_uploadsuccess: Усе зьвесткі пасьпяхова загружаныя - advice_waydragged: Дарога перанесеная (Z для адмены) - cancel: Адмяніць - closechangeset: Закрыцьцё набору зьменаў - conflict_download: Загрузіць іх вэрсію - conflict_overwrite: Замяніць вэрсію - conflict_poichanged: Пасьля таго, як Вы пачалі рэдагаваньне, нехта зьмяніў пункт $1$2. - conflict_relchanged: Пасьля таго, як Вы пачалі рэдагаваньне, нехта зьмяніў адносіны $1$2. - conflict_visitpoi: Націсьніце 'Добра' каб паказаць пункт. - conflict_visitway: Націсьніце 'Добра' каб паказаць дарогу. - conflict_waychanged: Пасьля таго, як Вы пачалі рэдагаваньне, нехта зьмяніў дарогу $1$2. - createrelation: Стварыць новую сувязь - custom: "Нестандартная:" - delete: Выдаліць - deleting: выдаленьне - drag_pois: Перацягніце і адпусьціце пункты інтарэсаў - editinglive: Рэдагаваць ужывую - editingoffline: Рэдагаваньне афляйн - emailauthor: "\\n\\nКалі ласка, дашліце паведамленьне пра памылку на адрас: richard@systemeD.net, пазначыўшы якія дзеяньні Вы выконвалі." - error_anonymous: Вы ня можаце кантактаваць з ананімным картографам. - error_connectionfailed: Прабачце, немагчыма злучыцца з сэрвэрам OpenStreetMap. Усе апошнія зьмены не былі захаваныя.\n\nВы жадаеце паспрабаваць зноў? - error_microblog_long: "Памылка адпраўкі да $1:\nHTTP-код: $2\nПаведамленьне пра памылку: $3\n$1 памылка: $4" - error_nopoi: Пункт інтарэсу ня знойдзены (верагодна Вы адхіліліся ў бок?), таму немагчыма адменіць. - error_nosharedpoint: Дарогі $1 і $2 болей не ўтрымліваюць агульных пунктаў, з-за гэтага немагчыма адмяніць падзел. - error_noway: Немагчыма знайсьці дарогу $1 (верагодна Вы аддаліліся), з-за гэтага немагчыма адмяніць. - error_readfailed: Прабачце, сэрвэр OpenStreetMap не адказаў на запыт зьвестак.\n\nВы жадаеце паспрабаваць зноў? - existingrelation: Дадаць у існуючыя сувязі - findrelation: Знайсьці адносіны, якія ўтрымліваюць - gpxpleasewait: Калі ласка пачакайце, пакуль GPX-трэкі апрацоўваюцца. - heading_drawing: Маляваньне - heading_introduction: Уводзіны - heading_pois: Пачатак працы - heading_quickref: Хуткая даведка - heading_surveying: Назіраньне - heading_tagging: Тэгаваньне - heading_troubleshooting: Вырашэньне праблемаў - help: Дапамога - hint_drawmode: націсьніце каб дадаць пункт\n, націсьніце двойчы/Return\n, каб скончыць лінію - hint_latlon: "шырата $1\nдаўгата $2" - hint_loading: загрузка зьвестак - hint_overendpoint: над канцавым пунктам ($1)\nклікніце каб далучыць\nshift-клікніце каб аб'яднаць - hint_overpoint: над пунктам ($1)\nнацісьніце каб далучыць - hint_pointselected: пункт выбраны\n(націсьніце з Shift на пункт\nкаб пачаць новую лінію) - hint_saving: захаваньне зьвестак - hint_saving_loading: загрузка/захаваньне зьвестак - inspector: Інспэктар - inspector_duplicate: Дублікат - inspector_in_ways: У дарогах - inspector_latlon: "Шырата $1\nДаўгата $2" - inspector_locked: Заблякаваны - inspector_node_count: ($1 разы) - inspector_not_in_any_ways: Няма ні ў якой дарозе (пункту інтарэсу) - inspector_unsaved: Не захавана - inspector_uploading: (загрузка) - inspector_way_connects_to: Злучэньне з $1 дарогамі - inspector_way_connects_to_principal: Злучаецца з $1 $2 і $3 іншым $4 - inspector_way_nodes: $1 пунктаў - inspector_way_nodes_closed: $1 пунктаў (закрыта) - loading: Загрузка… - login_pwd: "Пароль:" - login_retry: Вашае імя удзельніка не было распазнанае. Калі ласка, паспрабуйце зноў. - login_title: Немагчыма ўвайсьці - login_uid: "Імя ўдзельніка:" - mail: Пошта - more: Болей - newchangeset: "Калі ласка, паспрабуйце зноў: Potlatch пачне новы набор зьменаў." - "no": Не - nobackground: Без фону - norelations: Няма сувязяў у цяперашняй вобласьці - offset_broadcanal: Набярэжная шырокага канала - offset_choose: Выбраць зьмяшчэньне (m) - offset_dual: Дарога з разьдзяляльнай паласой (D2) - offset_motorway: Аўтамагістраль (D3) - offset_narrowcanal: Набярэжная вузкага каналу - ok: Добра - openchangeset: Адкрыцьцё набору зьменаў - option_custompointers: Выкарыстоўваць курсоры пяра і рукі - option_external: "Вонкавы запуск:" - option_fadebackground: Бляклы фон - option_layer_cycle_map: OSM — мапа для раварыстаў - option_layer_maplint: OSM - Maplint (памылкі) - option_layer_nearmap: "Аўстралія: NearMap" - option_layer_ooc_25k: "Гістарычная мапа Вялікабрытаніі: 1:25k" - option_layer_ooc_7th: "Гістарычная мапа Вялікабрытаніі: 7th" - option_layer_ooc_npe: "Гістарычная мапа Вялікабрытаніі: NPE" - option_layer_ooc_scotland: "Гісторыя Вялікабрытаніі: Шатляндыя" - option_layer_os_streetview: "Вялікабрытанія: OS StreetView" - option_layer_streets_haiti: "Гаіці: назвы вуліц" - option_layer_surrey_air_survey: "UK: Surrey Air Survey" - option_layer_tip: Выберыце фон для паказу - option_limitways: Папярэджваць, калі загружаецца зашмат зьвестак - option_microblog_id: "Назва мікраблёга:" - option_microblog_pwd: "Пароль мікраблёга:" - option_noname: Падсьвечваць дарогі без назваў - option_photo: "KML з фота:" - option_thinareas: Выкарыстоўваць больш тонкія лініі для абшараў - option_thinlines: Выкарыстоўваць тонкія лініі ва ўсіх маштабах - option_tiger: Пазначаць нязьменныя TIGER - option_warnings: Паказваць разгортваемыя папярэджаньні - point: Пункт - preset_icon_airport: Аэрапорт - preset_icon_bar: Бар - preset_icon_bus_stop: Аўтобусны прыпынак - preset_icon_cafe: Кавярня - preset_icon_cinema: Кінатэатар - preset_icon_convenience: Мінімаркет - preset_icon_disaster: Гаіцянскі будынак - preset_icon_fast_food: Забягайлаўка - preset_icon_ferry_terminal: Паром - preset_icon_fire_station: Пажарны пастарунак - preset_icon_hospital: Шпіталь - preset_icon_hotel: Гатэль - preset_icon_museum: Музэй - preset_icon_parking: Стаянка - preset_icon_pharmacy: Аптэка - preset_icon_place_of_worship: Культавае збудаваньне - preset_icon_police: Паліцэйскі пастарунак - preset_icon_post_box: Паштовая скрыня - preset_icon_pub: Паб - preset_icon_recycling: Сьметніца - preset_icon_restaurant: Рэстаран - preset_icon_school: Школа - preset_icon_station: Чыгуначная станцыя - preset_icon_supermarket: Супэрмаркет - preset_icon_taxi: Стаянка таксі - preset_icon_telephone: Тэлефон - preset_icon_theatre: Тэатар - preset_tip: Выберыце з мэню існуючыя тэгі, якія апісваюць $1 - prompt_addtorelation: Дадаць $1 да сувязі - prompt_changesetcomment: "Увядзіце апісаньне Вашых зьменаў:" - prompt_closechangeset: Закрыць набор зьменаў $1 - prompt_createparallel: Стварыць паралельную дарогу - prompt_editlive: Рэдагаваць ужывую - prompt_editsave: Рэдагаваньне з захаваньнем - prompt_helpavailable: Вы новы ўдзельнік? Націсьніце кнопку дапамогі зьлева. - prompt_launch: Перайсьці па вонкавай URL-спасылцы - prompt_live: Падчас рэдагаваньня ўжывую, кожны элемэнт, які Вы мяняеце, будзе захаваны ў базу зьвестак OpenStreetMap адразу. Гэты рэжым не рэкамэндуецца для пачаткоўцаў. Вы ўпэўнены? - prompt_manyways: Гэты абшар утрымлівае шмат элемэнтаў і будзе доўга загружацца. Можа лепей наблізіцца? - prompt_microblog: Даслаць да $1 (засталося $2) - prompt_revertversion: "Вярнуцца да папярэдняй захаванай вэрсіі:" - prompt_savechanges: Захаваць зьмены - prompt_taggedpoints: Некаторыя пункты на гэтай дарозе ўтрымліваюць апісаньне ці маюць адносіны. Сапраўды выдаліць? - prompt_track: Пераўтварыць GPS-трэк у дарогі - prompt_unlock: Націсьніце, каб разблякаваць - prompt_welcome: Вітаем у OpenStreetMap! - retry: Паспрабаваць - revert: Вярнуць - save: Захаваць - tags_backtolist: Вярнуцца да сьпісу - tags_descriptions: Апісаньне '$1' - tags_findatag: Знайсьці тэг - tags_findtag: Знайсьці тэг - tags_matching: Папулярныя тэгі, якія адпавядаюць '$1' - tags_typesearchterm: "Увядзіце слова для пошуку:" - tip_addrelation: Дадаць да сувязі - tip_addtag: Дадаць новы тэг - tip_alert: Узьнікла памылка. Націсьніце, каб атрымаць падрабязнасьці - tip_anticlockwise: Акружная дарога супраць гадзіньнікавай стрэлцы — націсьніце, каб зьмяніць напрамак - tip_clockwise: Акружная дарога па гадзіньнікавай стрэлцы — націсьніце, каб зьмяніць напрамак - tip_direction: Накіраваньні дарогаў — націсьніце для зьмены кірунку - tip_gps: Паказаць GPS-сьцежкі (G) - tip_noundo: Нічога да адмены - tip_options: Зьмена ўстановак (выберыце фон мапы) - tip_photo: Загрузка фота - tip_presettype: Выберыце які тып шаблёнаў паказваць ў мэню. - tip_repeattag: Паўтарыць тэг з папярэдняй выбранай дарогі (R) - tip_revertversion: Выберыце дату для вяртаньня да - tip_selectrelation: Дадаць да выбранага маршруту - tip_splitway: Падзяліць дарогу ў выбраным пункце (X) - tip_tidy: Уладкаваць пункты на дарогі (T) - tip_undo: Адмяніць $1 (Z) - uploading: Загрузка… - uploading_deleting_pois: Выдаленьне пунктаў інтарэсу - uploading_deleting_ways: Выдаленьне дарогаў - uploading_poi: Загрузка пункту інтарэсу $1 - uploading_poi_name: Загрузка пункту інтарэсы $1, $2 - uploading_relation: Загрузка сувязі $1 - uploading_relation_name: Загрузка сувязі $1, $2 - uploading_way: Загрузка дарогі $1 - uploading_way_name: Загрузка шляху $1, $2 - warning: Папярэджаньне! - way: Дарога - "yes": Так diff --git a/config/potlatch/locales/br.yml b/config/potlatch/locales/br.yml deleted file mode 100644 index 2c6108d7b..000000000 --- a/config/potlatch/locales/br.yml +++ /dev/null @@ -1,231 +0,0 @@ -# Messages for Breton (Brezhoneg) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Fohanno -# Author: Fulup -# Author: Y-M D -br: - a_poi: $1 ul LED - a_way: $1 un hent - action_addpoint: Ouzhpennañ ur poent e dibenn un hent - action_cancelchanges: o nullañ ar c'hemmoù da - action_changeway: kemmoù d'un hent - action_createparallel: o krouiñ hentoù kenstur - action_createpoi: Krouiñ ur LED (lec'h dedennus) - action_deletepoint: o tiverkañ ur poent - action_insertnode: Ouzhpennañ ur poent war an hent - action_mergeways: Juntañ daou hent - action_movepoi: Dilec'hiañ ul LED - action_movepoint: Dilec'hiañ ur poent - action_moveway: Dilec'hiañ un hent - action_pointtags: Arventennañ ur poent - action_poitags: Arventennañ ul LED - action_reverseway: Eilpennañ tu an hent - action_revertway: oc'h eilpennañ un hent - action_splitway: Gaoliñ un hent - action_waytags: Arventennañ un hent - advanced: Araokaet - advanced_close: Serriñ ar strollad kemmoù - advanced_history: Istor an hent - advanced_inspector: Enseller - advanced_maximise: Brasaat ar prenestr - advanced_minimise: Bihanaat ar prenestr - advanced_parallel: Hent kenstur - advanced_tooltip: Oberoù aozañ araokaet - advanced_undelete: Dizilemel - advice_bendy: Re gromm evit bezañ eeunaet (Pennlizh. evit rediañ) - advice_conflict: Tabut gant ar servijer - marteze o po da glask enrollañ adarre - advice_deletingpoi: O tilemel POI (Z evit dizober) - advice_deletingway: O tilemel an hent (Z evit dizober) - advice_microblogged: Hizivaet eo bet ho statud $1 - advice_nocommonpoint: N'eus poent boutin ebet etre an hentoù - advice_revertingpoi: Distreiñ d'ar POI enrollet da ziwezhañ (Z evit dizober) - advice_revertingway: Distreiñ d'an hent enrollet da ziwezhañ (Z evit dizober) - advice_tagconflict: Ne glot ket ar menegoù - Gwiriit mar plij (Z evit dizober) - advice_toolong: Re hir evit disac'hañ an enkadenn - Rannit an hent e hentoù berroc'h - advice_uploadempty: Netra da gas - advice_uploadfail: Kasadenn ehanet - advice_uploadsuccess: Kaset eo bet an holl roadennoù - advice_waydragged: Hent dilec'hiet (Z evit dizober) - cancel: Nullañ - closechangeset: O serriñ ar strollad kemmoù - conflict_download: Pellgargañ o stumm - conflict_overwrite: Skrivañ war-c'horre o stumm - conflict_poichanged: Abaoe m'emaoc'h oc'h aozañ eo bet cheñchet ar poent $1$2 gant unan bennak all. - conflict_relchanged: Abaoe m'emaoc'h oc'h aozañ eo bet cheñchet an darempred $1$2 gant unan bennak all. - conflict_visitpoi: Klikit war "Mat eo" evit diskouez ar poent. - conflict_visitway: Klikit war "Mat eo" evit diskouez an hent. - conflict_waychanged: Abaoe m'emaoc'h oc'h aozañ eo bet cheñchet an hent $1$2 gant unan bennak all. - createrelation: Krouiñ un darempred nevez - custom: "Personelaet :" - delete: Diverkañ - deleting: o tiverkañ - drag_pois: Riklañ ha merkañ Lec'hioù dedennus - editinglive: Aozañ war-eeun - editingoffline: Labourat ezlinenn - emailauthor: "\n\nTrugarez da gas keloù da richard\\@systemeD.net evit menegiñ an draen, ha displegañ dezhañ ar pezh e oac'h oc'h ober p'eo c'hoarvezet." - error_anonymous: Ne c'hallit ket mont e darempred gant ur c'hartennour dizanv. - error_connectionfailed: "Ho tigarez, c'hwitet eo kevreañ ouzh servijer OpenStreetMap. N'eo ket bet enrollet ho kemmoù diwezhañ.\n\nEsaeañ en-dro ?" - error_microblog_long: "C'hwitet eo bet ar bostadenn da $1 :\nKod HTTP : $2\nKemennadenn fazi : $3\nFazi $1 : $4" - error_nopoi: N'eo ket bet kavet al Lec'h Dedennus (LED), war ur bajenn all marteze ?, n'hall ket bezañ assavet. - error_nosharedpoint: "N'eus mui poent boutin ebet etre an hentoù $1 ha $2, setu n'haller ket o adpegañ : n'haller ket dizober an dispartiadenn zo bet graet a-raok." - error_noway: N'eo ket bet kavet an hent $1, n'hall ket bezañ assavet d'e stad kent. - error_readfailed: Ho tigarez - servijer OpenStreetMap n'en deus ket respontet pa oa bet goulennet roadennoù digantañ.\n\nC'hoant hoc'h eus da esaeañ en-dro ? - existingrelation: Ouzhpennañ d'un darempred zo anezhañ c'hoazh - findrelation: Kavout un darempred ennañ - gpxpleasewait: Gortozit e-keit ha ma pleder gant ar roud GPX. - heading_drawing: Tresadenn - heading_introduction: Digoradur - heading_pois: Kregiñ ganti - heading_quickref: Dave prim - heading_surveying: Oc'h evezhiañ - heading_tagging: O tikedenniñ - heading_troubleshooting: Kudennoù - help: Skoazell - help_html: "Degemer mat e Potlatch\nPotlatch zo anezhañ ur programm aes da implijout evit degas kemmoù war OpenStreetMap. Tresit hentoù, gwenodennoù, merkoù war an douar ha stalioù diwar ho roadennoù GPS, skeudennoù dre loarell pe kartennoù kozh.\n\nGant ar pajennoù skoazell-mañ e vo desket deoc'h implij diazez Potlatch hag e vo lavaret deoc'h penaos gouzout hiroc'h. Klikit war an titloù amañ a-us evit kregiñ ganti.\n\nPa vo echu ganeoc'h, n'ho po nemet klikañ en ul lec'h bennak all war ar bajenn.\n\n\n\nTraoù mat da c'houzout\nArabat eiltresañ kartennoù all !\n\nMa tibabit 'Kemmañ war-eeun' e vo kaset an holl gemmoù degaset ganeoc'h d'ar bank titouroù a-feur ma tresit anezho (diouzhtu-dak!). Ma n'oc'h ket arroutet-kaer, grit gant 'Kemmañ dre enrollañ' ha ne vo kaset ho kemmoù nemet goude bezañ kliket war 'enrollañ'.\n\nDre-vras e vo diskouezet war ar gartenn ar c'hemmoù graet ganeoc'h un eurvezh pe ziv goude ma vint bet graet (tammoù traoù a c'hall padout ur sizhunvezh). N'emañ ket pep tra war ar gartenn rak amsklaer e teufe da vezañ. Koulskoude, p'eo frank a wirioù roadennoù OpenStreetMap, e c'hall pep hini sevel kartennoù a ziskouez elfennoù disheñvel - evel OpenCycleMap pe Midnight Commander.\n\nHo pet soñj ez eo, war un dro ur gartenn blijus da welet (tresit 'ta krommennoù brav evit ar c'hornblegoù) hag un diagramm (gwiriit mat emañ stok-ha-stok an hentoù er poentoù kej).\n\nHa lavaret hon eus deoc'h c'hoazh eo arabat eiltresañ kartennoù all ?\n\n\nGouzout hiroc'h\nDornlevr Potlatch\nRolloù skignañ\nFlap enlinenn (skoazell war-eeun)\nForom web\nWiki ar gumuniezh\nKod tarzh Potlatch\n\n\n\nKregiñ ganti\nBremañ m'eo digor Potlatch ganeoc'h, klikit war \"Aozañ gant enrolladennoù\" evit kregiñ ganit.\n\nSetu m'oc'h prest da dresañ ur gartenn. Ar pep aesañ, evit kregiñ ganti, eo lakaat un nebeud lec'hioù dedennus - pe \"LDoù\". Ar re-se a c'hall bezañ tavarnioù, ilizoù, porzhioù-houarn... ar pezh a garit.\n\nRiklañ-dilec'hiañ\nEvit aesaat ar jeu deoc'h e c'hallot gwelet un dibab LDoù, just e traoñ ho kartenn. Ken eeun ha tra eo merkañ unan war ar gartenn : n'hoc'h eus ken nemet riklañ-dilec'hiañ unan davet e lec'hiadur war ar gartenn. Ha na rit ket biloù ma ne zeuit ket a-benn d'e lec'hiañ diwar ar c'hentañ taol : gallout a rit e zilec'hiañ betek ma vo el lec'h mat. Notit mat eo dreistlinennet an LD e melen, da ziskouez eo bet diuzet.\n\nUr wezh ma vo bet graet an dra-se ganeoc'h e fello deoc'h reiñ un anv d'an davarn (pe iliz pe ti-gar). Gwelet a reot un daolennig o tont war wel en traoñ. Unan eus ar monedoù a vo 'anv' heuliet gant \"(skrivañ an anv amañ)\". Grit se, klikit war an destenn-se ha skrivit an anv.\n\nKlikit en ul lec'h bennak all war ar gartenn evit diziuzañ an LD, ha dont a ray ar banell vihan e liv war wel adarre.\n\nAes eo, neketa ? Klikit war \"Enrollañ\" (en traoñ a-zehou) p'ho po echu.\nDilec'hiañ\nEvit mont d'ul lodenn disheñvel eus ar gartenn, riklit un takad goullo eus ar gartenn. Karget e vo ar roadennoù gant Potlatch (sellit en nec'h hag a-zehou).\n\nLavaret ez eus bet deoc'h klikañ war \"Aozañ gant enrollañ\" met gallout a rit ivez 'enrollañ war-eeun'. Ma rit se ez aio diouzhtu ar c'hemmoù degaset ganeoc'h er bank titouroù. Setu aze n'eus bouton 'Enrollañ' ebet. Talvoudus eo evit degas kemmoù bihan hag evit abadennoù kartennaouiñ.\n\nPazennoù da-heul\nLaouen oc'h gant kement-se ? Mat. Klikit war ar bouton \"En em lec'hiañ\" evit kavout penaos dont da vezañ ur gwir gartennour !\n\nEn em lec'hiañ gant ur GPS\nMennozh bras OpenStreetMap eo sevel ur gartenn hep ar gwirioù aozer stag ouzh ar c'hartennoù all. Talvezout a ra n'hallot ket tresañ forzh petra : ret eo deoc'h mont war an dachenn hoc'h-unan. Dre chañs, n'eus nemet plijadur da gaout !\nAn doare aesañ d'en ober eo implijout ur GPS chakod. Kavit un takad digartenn, kit di war droad pe war velo en ur weredekaat ho k/GPS. Merkit anvioù ar straedoù ha kement tra dedennus all a verzot (tavarnioù, ilizoù...) e-ser ho pourmenadenn.\n\nPa zistroot d'ar gêr, e vo gant ho k/GPS un enrolladenn \"tracklog\" eus kement lec'h m'oc'h bet. Gallout a rit kargañ an traoù-se en OpenStreetMap.\n\nAr GPSoù gwellañ eo ar re a enroll al lec'hiadur aliezik (bep eilenn pe ziv) ha dezho ur memor bras. Ur bern eus hor c'hartennourien a ra gant GPSoù chakod Gamin pe unvezioù Bluetooth bihan. War hor wiki e vo kavet burutelladennoù GPS dre ar munud.\n\nKargañ ho roudenn\nBremañ e rankit eztennañ ho roadnnoù er-maez eus ar GPS. Marteze e teu ho k/GPS gant un tamm meziant pe e c'hallit eilañ ar restroù gant un alc'hwez USB. Ma n'emañ ket kont evel-se, klaskit GPSBabel. Ne vern an doare, ret eo d'ar roadennoù bezañ er furmad GPX.\n\nDa c'houde, grit gant an ivinenn 'roudennoù GPS' da enporzhiañ ho roudenn war OpenStreetMap. Kement-se n'eo nemet an deroù. Evit ar mare n'emañ ket an traoù war ar gartenn c'hoazh. Ret eo deoc'h tresañ ha merkañ anvioù ar straedoù c'hwi hoc'h-unan en ur ober gant ur roudenn evit heñchañ ac'hanoc'h.\nImplijout ho roudenn\nKlaskit ar roudennoù enporzhiet er roll 'roudennoù GPS' ha klikit war 'aozañ' just e-kichenik. Loc'hañ a raio Potlach gant ar roudenn-se karget hag an holl valizennoù. Prest oc'h da dresañ !\n\nKlikañ war ar bouton a c'hallit ober ivez da welet roudennoù GPS ar re all (nemet ar balizennoù ne welot ket) evit an takad a labourit warnañ. Dalc'hit war Pennlizh. mar fell deoc'h diskwel ho roudennoù deoc'h nemetken.\nImplijout luc'hskeudennoù dre loarell\nMa n'eus GPS ebet ganeoc'h, arabat en em chalañ. E kêrioù zo hon eus luc'hskeudennoù dre loarell a c'haller tresañ warno, pourchaset gant skoazell hegarat Yahoo! (trugarez dezhañ !). Kit d'ober un dro da notennañ anvioù ar straedoù, ha neuze distroit ha tresit war al linennoù.\n\nMa ne welit ket ar skeudenn dre loarell, klikit war ar bouton dibaboù ha gwiriit hag-eñ eo diuzet \"Yahoo!\". Ma n'he gwelit ket c'hoazh, marteze n'eus ket anezhi evit ho kêr, pe ezhomm zo da zoumañ un tammig pelloc'h.\n\nWar ar bouton dibarzhioù-se e kavot dibaboù all, evel ur gartenn hep gwirioù aozer eus Breizh-Veur hag OpenTopoMap evit SUA. Diuzet int bet a-ratozh peogwir omp aotreet d'ober ganto. Na eiltresit ket diwar kartennoù pe skeudennoù dre nij (abalamout d'ar gwirioù aozer).\n\nA-wezhioù e vez un tammig dilec'hiet ar skeudennoù dre loarell e-keñver al lec'h m'emañ an hentoù e gwirionez. M'en em gavit gant se, pouezit war Esaouenn ha dilec'hiit an drekleur betek ma vo el lec'h mat. Fiziit atav muioc'h er roudennoù GPS eget er skeudennoù dre loarell.\n\nTresañ hentoù\nEvit tresañ un hent (pe ur 'wenodenn') a grog en ul lec'h gwerc'h war ar gartenn, klikit war al lec'h a fell deoc'h; goude-se klikit ivez war kement poent eus an hent. Ur wezh echu ganeoc'h, daouglikit pe pouezit war Enmont - ha goude-se klikit un tu bennak all evit diziuzañ an hent.\n\nEvit tresañ un hent en ur gregiñ adalek un hent all, klikit war an hent-se d'e ziuzañ; ruz e vo merket ar poentoù anezhañ. Pouezit war Pennlizh. ha klikit war unan eus ar poentoù-se da gregiñ gant un hent all. (ma n'eus poent ruz ebet er poent kej, grit pennlizh.+klik el lec'h mar fell deoc'h lakaat unan).\n\nKlikit war « Enrollañ » (en traoñ a-zehou) pa vo echu ganeoc'h. Enrollit alies, betek-gouzout e vefe ur gudenn gant ar servijer.\n\nNe vo ket diskouezet diouzhtu ho kemmoù war ar benngartenn. Ret eo gortoz un eurvezh pe ziv peurliesañ, ha betek ur sizhunvezh a-wechoù.\nOber kroashentoù\nPouezus-meurbet eo e vefe ur poent (pe ur 'skoulm') el lec'h ma kej daou hent. Implijet e vez an dra-se gant an dreserien hentadoù da c'houzout pelec'h treiñ.\n\nPotlach a ra war-dro an dra-se gant ma'z po taolet evezh da glikañ rik war an hent a fell deoc'h kejañ gantañ. Arouezioù zo a harp ac'hanoc'h : dont a ra ar poentoù da vezañ glas, cheñch a ra ar poenterioù hag ur wezh echu e vo du trolinenn ar poent kej.\nDilec'hiañ ha dilemel\nMont a ra en-dro evel ma oac'h o c'hortoz. Evit dilemel ur poent, diuzit-eñ ha pouezit war Dil. Evit dilemel un hent a-bezh, pouezit war Pennlizh.-Dil.\n\nEvit dilec'hiañ un dra bennak eo trawalc'h riklañ-eñ. (Ret e vo deoc'h klikañ ha gortoz ur pennad a-raok riklañ un hent evit ma ne vefe ket graet ganeoc'h hep rat.)\nTresañ traoù kempleshoc'h\nMa vez daou anv disheñvel gant div lodenn eus an hevelep hent e vo ret deoc'h o disrannañ. Klikit war an hent ha war ar poent dispartiañ; klikit war ar sizhailh. (gallout a rit kendeuziñ hentoù en ur glikañ war Kontroll, pe alc'hwez an Aval war Mac, met na gendeuzit ket daou seurt hent pe daou hent dezho anvioù disheñvel).\n\nUn tammig eo diaes ar c'hroashentoù-tro da dresañ. Potlach a c'hall skoazellañ ac'hanoc'h. Brastresit al lagadenn ha taolit evezh e vo skoulmet mat an dro; goude-se klikit war an arlun-mañ evit ma vo peurgelc'hiek. (An dra-se a c'hallit ober war an hentoù ivez, evit eeunaat anezho).\nLec'hioù dedennus\nTra gentañ hoc'h eus desket a oa riklañ-dilec'hiañ ul lec'h dedennus. Gallout a rit ivez krouiñ unan en ur zaouglikañ war ar gartenn : dont a ra ur c'helc'h gwer war wel. Penaos an diaoul merkañ ez eo un davarn , un iliz pe un dra bennak all c'hoazh ? Klikit war 'Balizennañ' a-is evit gouzout !\n\nPeseurt hent eo ?\nUr wezh treset un hent ganeoc'h, e tlfec'h lavaret petra eo. Un hent bras, ur wenodenn pe ur stêr ? Pe anv eo ? Daoust ha reolennoù difer zo (da sk. \"berzet ouzh ar marc'hoù-houarn\") ?\n\nE OpenStreetMap eo termenet an dra-se en ur ober gant 'balizennoù'. Div lodenn zo dezho ha gallout a rit kaout kement anezho ha ma karit. Da sk. e c'hallit ouzhpennañ highway | trunk da verkañ ez eo ur pennhent; highway | residential da verkañ eo un hent annezet; pe highway | footway da verkañ ez eo un hent bale. Mard eo berzet ouzh ar marc'hoù-houarn e c'hallit ouzhpennañ bicycle | no. Goude-se, evit merkañ an anv anezhañ, ouzhpennit name | Straed ar Marc'hallac'h.\n\nE Potlach e teu war wel ar balizennoù e traoñ ar skramm : klikit war un hent hag e welot ar balizennoù anezhañ. Klikit war an arouezenn '+' (en traoñ a-zehou) da ouzhpennañ ur valizenn nevez. Evit he diverkañ, klikañ war an 'x' en he c'hichen.\n\nBalizennañ hentoù penn-da-benn a c'hallit ober; ar poentoù war an hentoù (da sk., un treizhaj pe gouleier tremenerezh) hag al lec'hioù dedennus.\nImplijout balizennoù rakdiuzet\nEvit ho sikour da gregiñ ganti, Polatch en deus balizennoù prest-ha-tout.\n\nDiuzit un hent, ha kit dre anholl arouezennoù betek ma kavot unan a zere. Da c'houde, dibabit an dibarzhioù a glot ar gwellañ el lañser.\n\nSe a leunio ar balizennoù. Lod a chomo peuzgoullo da vezañ leuniet ganeoc'h, da skouer, gant anv an straed hag an niverenn.\nHentoù unroud\nMarteze e fello deoch' ouzhpennañ ur valizenn evel oneway | yes - met penaos merkañ an tu ? Ur bir zo en traoñ a-gleiz a verk tu an hent, eus an disparti a-gleiz. Klikit warnañ da eilpennañ an tu.\nDibab ho palizennoù deoc'h-c'hwi\nEvel-just, n'oc'h ket rediet d'ober gant ar balizennoù raktermenet hepken. Dre implijout ar bouton « + », e c'hallit implijout forzh peseurt balizenn all.\n\nGwelet peseurt balizenoù a vez implijet gant an dud all a c'hallit war OSMdoc, hag unhir a roll balizennoù implijet-kenañ zo war hor wiki anvet Map Features. Met kement-se n'eo nemet kinnigoù, n'int ket reolennoù. Gallout a rit ijinañ ar balizennoù a fell deoc'h pe amprestañ re an implijerien all.\n\nAbalamour ma vez implijet OpenStreetMap evit ober kalz kartennoù disheñvel, e vo diskouezet gant pep kartenn he dibab balizennoù dezhi.\nDarempredoù\nA-wezhioù n'eus ket trawalc'h gant ar balizennoù hag e fell deoc'h 'bodañ ' daou hent pe muioc'h. Marteze eo difennet treiñ eus un eil hent d'egile pe 20 hent asambles a ya d'ober un hent divrodegoù balizennet. Gallout a rit ober an dra-se gant un arc'hwel anvet 'darempredoù'. Gouzout hiroc'h war ar wiki.\n\nDizober fazioù\nHemañ eo ar bouton dizober (gallout a rit ivez pouezañ war Z) - dizober a raio an dra ziwezhañ hoc'h eus graet.\n\nGallout a rit 'distreiñ' da stumm kent unhent pe ur poent bennak. Diuzit-eñ ha klikit war an ID anezhañ (an niver en traoñ a-gleiz) ha pouezit war H (evit 'istor'). Gwelet a reot roll an holl dud o deus kemmet anezhañ ha pegoulz. Dibabit ur stumm da assevel ha klikit war dizober.\n\nM'hoc'h eus diverket un hent dre fazi hag enrollet an traoù, klikit war U (evit 'Undelete', diziverkañ e saozneg). Dont a raio war wel an holl hentoù diverket. Dibabit an hini a fell deoc'h, dibrennit anezhañ en ur glikañ war ar c'hadranas ruz hag enrollit evel boas.\n\nSoñjal a ra deoc'h ez eus bet graet ur fazi gant unan bennak all ? Kasit ur gemennadenn jentil dezhañ. Implijit an istor (H) evit diuzañ e anv ha goude-se klikit war \"Postel\".\n\nImplijit an Enseller (el lañser \"Araokaet\") evit kaout titouroù talvoudus diwar-benn an hent pe ar poent red.\nFAGoù\nPenaos e c'hallan gwelet ma foentoù tro ?\nAr poentoù tro ne zeuont war wel nemet ma klikit war 'aozañ' e-kichen anv ar roudenn adalek 'Roudennoù GPS'. Ret eo d'ar restr bezañ poentoù tro ha roudennoù enni. Disteuler a ra ar servijer kement restr enni poentoù tro nemetken.\n\nFAGoù all evit Potlatch hag OpenStreetMap.\n\n\n\nLabourat buanoc'h\nSeul belloc'h e zoumit seul vuioc'h a roadennoù a zle bezañ karget gant Potlatch. Zoumit tostoc'h a-raok klikañ war \"Aozañ\".\n\nDiweredekait an dibarzh 'Erlec'hiañ al logodenn gant ar C'hreion hag an Dorn' (e prenestr an dibarzhioù) evit un tizh brasoc'h.\n\nMard eo gorrek ar servijer, distroit diwezhatoc'hik. Gwiriit war ar wiki evit ar c'hudennoù anavezet. MAreoù zo, evel ar Sul da noz a vez soulgarget dalc'hmat.\n\nLakait Potlatch da gaout soñj eus ar rikoù balizennañ a implijit ar muiañ/ Diuzit un hent pe ur poent gant ar balizennoù-se ha pouezit war Ktrl, Pennlizh. hag un niver etre 1 ha 9. Da c'houde, evit o lakaat en-dro, pouezit Pennlizh. hag an niverenn-se. (Aze e vint bep tro ha ma implijot Potlatch war an urzhiataer-mañ).\n\nGrit un hent gant ho roudenn GPS en ur gavout anezhañ er roll 'Roudennoù GPS' da gentañ, en ur glikañ war 'Aozañ' e-kichen, hag en ur glikañ war ar bouton 'amdreiñ' er fin. Prennet e vo, e ruz, e-giz-se ne vo ket enrollet. Aozit-eñ da gentañ a-raok klikañ war ar c'hadranas ruz evit e zibrennañ pa viot prest d'e enrollañ.\n\nWar betra klikañ\nRiklañ ar gartenn evit dilec'hiañ.\nDaou glik evit krouiñ un LD nevez.\nUr c'hlik evit kregiñ gant un hent nevez.\nDerc'hel ha riklañ un LD evit e zilec'hiañ.\nPa dreser un hent\nDaouglikit pe pouezit war ar bouton Enmont evit echuiñ tresañ.\nKlikit war un hent all evit ober ur c'hroashent.\nPennlizh+klik dibenn un hent all evit kendeuziñ.\nPa vez diuzet un hent\nKlikit war ur poent evit e ziuzañ.\nPennlizh+klik war an hent da zegas ur poent nevez.\nPennlizh+klik war ur poent da voulc'hañ un hent nevez alese.\nKontroll+klik war un hent all evit kendeuziñ.\n\nBerradurioù klavier\nB Ouzhpennañ ur valizenn mammenn eus an drekleur\nC Serriñ ar strollad kemmoù\nG Diskouez ar roudennoù GPS\nH Diskouez an istor\nI Diskouez an enseller\nJ Juntrañ ar poent d'ur c'hroashent\n(+Shift) Unjoin from other ways\nK Prennañ/dibrennañ an diuzadenn red\nL Diskouez al ledred/hedred red\nM Brasaat ar prenestr aozañ\nP Krouiñ un hent kenstur\nR Adskrivañ ar balizennoù\nS Enrollañ (nemet e vefed oc'h aozañ war-eeun)\nT Aozañ en ul linenn eeun/kelc'h\nU Assevel (diskouez an hentoù diverket)\nX Troc'hañ an hent etre daou\nZ Dizober\n- Lemel ar poent eus an hent-mañ hepken\n+ Ouzhpennañ ur valizenn nevez\n/ Diuzañ un hent all a rann ar poent-se\nDil Dilemel ar poent\n (+Pennlizh.) Diverkañ an hent a-bezh\nKas Echuiñ tresañ al linenn\nSpace Derc'hel ha dilec'hiañ an drekleur\nEsc Dilezel ar c'hemmoù; adkargañ adalek ar servijer\n0 Lemel an holl valizennoù\n1-9 Diuzañ ar balizennoù rakdiuzet\n (+Shift) Dibab ar balizennoù enrollet\n (+S/Ktrl) Memoriñ ar balizennoù\n§ or ` Kelc'hiad etre ar strolladoù balizennoù\n\n" - hint_drawmode: Klikañ evit ouzhpennañ ur poent\nDaouglikañ\nevit Distreiñ da dibenn al linenn - hint_latlon: "ledred $1\nhedred $2" - hint_loading: O kargañ an hentoù - hint_overendpoint: War poent diwezhañ an tres\nKlikañ evit juntañ\nShift-klik evit kendeuziñ - hint_overpoint: "Poent war-c'horre\nKlikañ evit juntañ" - hint_pointselected: "Lec'h diuzet\n(Shift-klik war al lec'h evit\nsevel ul linenn nevez)" - hint_saving: oc'h enrollañ ar roadennoù - hint_saving_loading: o kargañ / oc'h enrollañ roadennoù - inspector: Enseller - inspector_duplicate: Doublenn eus - inspector_in_ways: En hentoù - inspector_latlon: "Ledred $1\nHedred $2" - inspector_locked: Morailhet - inspector_node_count: ($1 gwezh) - inspector_not_in_any_ways: N'emañ ket en hent ebet (POI) - inspector_unsaved: N'eo ket enrollet - inspector_uploading: (o kargañ) - inspector_way_connects_to: Kevreet ouzh $1 hent - inspector_way_connects_to_principal: Kevreañ ouzh $1 $2 ha $3 re all $4 - inspector_way_nodes: $1 skoulm - inspector_way_nodes_closed: $1 skoulm (serret) - loading: O kargañ... - login_pwd: "Ger-tremen :" - login_retry: Anavezerioù ho lec'hienn n'int ket bet anavezet. Esaeit en-dro, mar plij. - login_title: N'eus ket bet gallet kevreañ - login_uid: "Anv implijer :" - mail: Postel - more: Titouroù - newchangeset: "\nEsaeit adarre, mar plij : Potlatch a lañso ur strollad kemmoù nevez." - "no": Ket - nobackground: Drekleur ebet - norelations: Darempred ebet en takad diskouezet - offset_broadcanal: Hent-kanol ledan - offset_choose: Dibab an offset (m) - offset_dual: Hent peder forzh (D2) - offset_motorway: Gourhent (D3) - offset_narrowcanal: Hent-kanol strizh - ok: Mat eo - openchangeset: Digeriñ ur c'hemmset - option_custompointers: Erlec'hiañ al logodenn gant ar C'hreion hag an Dorn - option_external: "Lañsadenn diavaez :" - option_fadebackground: Drekleur sklaeraet - option_layer_cycle_map: OSM - kartenn divrodegoù - option_layer_maplint: OSM - Maplint (fazioù) - option_layer_nearmap: "Aostralia : NearMap" - option_layer_ooc_25k: "Istor UK : 1:25k" - option_layer_ooc_7th: "Istor UK : 7vet" - option_layer_ooc_npe: Istor UK NPE - option_layer_ooc_scotland: "R-U istorel : Skos" - option_layer_os_streetview: "R-U : OS StreetView" - option_layer_streets_haiti: "Haiti: anvioù ar straedoù" - option_layer_surrey_air_survey: "Rouantelezh Unanet : Muzuliadenn Aerel Surrey" - option_layer_tip: Dibab an drekleur da ziskwel - option_limitways: Kas ur c'hemenn pa vez karget kalz a roadennoù pounner - option_microblog_id: "Anv ar mikroblog :" - option_microblog_pwd: "Ger-tremen mikroblog :" - option_noname: Dreistlinennañ an hentoù dizanv - option_photo: "Luc'hskeudenn KML :" - option_thinareas: Implijout linennoù moanoc'h evit an takadoù - option_thinlines: Ober gant un tres moan evit an holl skeulioù - option_tiger: Dresitlinennañ TIGER n'eo ket bet kemmet - option_warnings: Diskouez ar c'hemennoù-diwall war-neuñv - point: Poent - preset_icon_airport: Aerborzh - preset_icon_bar: Tavarn - preset_icon_bus_stop: Arsav bus - preset_icon_cafe: Kafedi - preset_icon_cinema: Sinema - preset_icon_convenience: Ispiserezh - preset_icon_disaster: Savadurioù Haiti - preset_icon_fast_food: Boued buan - preset_icon_ferry_terminal: Lestr-treizh - preset_icon_fire_station: Kazarn pomperien - preset_icon_hospital: Ospital - preset_icon_hotel: Leti - preset_icon_museum: Mirdi - preset_icon_parking: Parklec'h - preset_icon_pharmacy: Apotikerezh - preset_icon_place_of_worship: Lec'h azeuliñ - preset_icon_police: Burev polis - preset_icon_post_box: Boest-lizheroù - preset_icon_pub: Ostaleri - preset_icon_recycling: Oc'h adaozañ - preset_icon_restaurant: Preti - preset_icon_school: Skol - preset_icon_station: Porzh-houarn - preset_icon_supermarket: Gourmarc'had - preset_icon_taxi: Taksilec'h - preset_icon_telephone: Pellgomz - preset_icon_theatre: C'hoariva - preset_tip: Dibab en ul lañser balizennoù rakdiuzet a zeskriv an $1 - prompt_addtorelation: Ouzhpennañ $1 d'un darempred - prompt_changesetcomment: "Merkit un tamm deskrivadenn eus ar c'hemmoù bet degaset ganeoc'h :" - prompt_closechangeset: Serriñ ar strollad kemmoù $1 - prompt_createparallel: Krouiñ un hent kenstur - prompt_editlive: Aozañ war-eeun - prompt_editsave: Aozañ hag enrollañ goude - prompt_helpavailable: Implijer nevez ? Sellit en traoñ a-gleiz da gaout skoazell. - prompt_launch: Lañsañ un URL diavaez - prompt_live: Er mod war-eeun e vo saveteet raktal e diaz titouroù OpenStreetMap kement elfenn kemmet ganeoc'h - N'eo ket erbedet d'an deraouidi. Ha sur oc'h e fell d'ober implijout ar mod-se ? - prompt_manyways: Resis-tre eo an takad-mañ, lakaat a raio un tamm mat a amzer da gargañ. Ne gavit ket gwelloc'h zoumin kentoc'h ? - prompt_microblog: Postañ war $1 ($2 a chom) - prompt_revertversion: "Distreiñ d'ur stumm enrollet koshoc'h :" - prompt_savechanges: Enrollañ ar c'hemmoù - prompt_taggedpoints: Kevelet eo poentoù zo eus an hent-mañ gant gerioù-alc'hwez pe darempredoù. Ha c'hoant ho peus da vat lemel anezho kuit ? - prompt_track: Amdreiñ ur roud GPS d'un hent (prennet) da aozañ. - prompt_unlock: Klikañ evit dibrennañ - prompt_welcome: Degemer mat war OpenStreetMap ! - retry: Esaeañ en-dro - revert: Disteuler - save: Enrollañ - tags_backtolist: Distreiñ d'ar roll - tags_descriptions: Deskrivadurioù '$1' - tags_findatag: Kavout un tikedenn - tags_findtag: Kavout un tikedenn - tags_matching: Tikedennoù brudet hag a glot gant '$1' - tags_typesearchterm: "Lakait ar ger da glask :" - tip_addrelation: Ouzhpennañ d'un darempred - tip_addtag: Ouzhpennañ ur meneg nevez - tip_alert: Ur fazi zo bet - Klikit da c'houzout hiroc'h - tip_anticlockwise: Tremenerezh e tu kontrol bizied an eurier (trigonometrek) - Klikañ evit eilpennañ an tu - tip_clockwise: Tremenerezh e tu bizied an eurier - Klikañ evit eilpennañ an tu - tip_direction: Tu an hent - Klikañ evit eilpennañ - tip_gps: Diskwel ar roudoù GPS (G) - tip_noundo: Netra da zizober - tip_options: Dibarzhioù (dibab ar gartenn drekleur) - tip_photo: Kargañ luc'hskeudennoù - tip_presettype: Dibab ar seurt arventennoù kinniget el lañser diuzañ. - tip_repeattag: Eilañ titouroù an hent bet diuzet a-raok (R) - tip_revertversion: Dibab ar stumm da zistreiñ davetañ - tip_selectrelation: Ouzhpennañ d'an hent dibabet - tip_splitway: Gaoliñ an hent d'ar poent diuzet (X) - tip_tidy: Poentoù urzhiet en hent (T) - tip_undo: Dizober an oberiadenn $1 (Z) - uploading: Oc'h enporzhiañ... - uploading_deleting_pois: O tilemel ar POIoù - uploading_deleting_ways: O tilemel an hentoù - uploading_poi: O kargañ POI $1 - uploading_poi_name: O kargañ POI $1, $2 - uploading_relation: O kargañ an darempred $1 - uploading_relation_name: O kargañ an darempred $1, $2 - uploading_way: O kargañ an hent $1 - uploading_way_name: O kargañ an hent $1, $2 - warning: Diwallit ! - way: Hent - "yes": Ya diff --git a/config/potlatch/locales/ca.yml b/config/potlatch/locales/ca.yml deleted file mode 100644 index d5223ecbe..000000000 --- a/config/potlatch/locales/ca.yml +++ /dev/null @@ -1,229 +0,0 @@ -# Messages for Catalan (Català) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Jmontane -# Author: PerroVerd -ca: - a_poi: $1 un punt d'interès (POI) - a_way: $1 una via - action_addpoint: afegir un node al final d'una via - action_cancelchanges: cancel·la canvis a - action_changeway: canvis a una via - action_createparallel: crea vies paralel·les - action_createpoi: Crea un punt d'interès (POI) - action_deletepoint: Esborra un punt - action_insertnode: addició d'un node a una via - action_mergeways: fusió de dues vies - action_movepoi: s'estaà movent un punt d'interès (POI) - action_movepoint: Moure un punt - action_moveway: moviment d'una via - action_pointtags: Posa etiquetes en un punt - action_poitags: Posa etiquetes en un punt d'interès (POI) - action_reverseway: inverteix el sentit de la via - action_revertway: reverteix una via - action_splitway: Divideix una via - action_waytags: l'establiment d'etiquetes d'una via - advanced: Avançat - advanced_close: Tanca el conjunt de canvis - advanced_history: Historial de la via - advanced_inspector: Inspector - advanced_maximise: Maximitzar la finestra - advanced_minimise: Minimitzar finestra - advanced_parallel: Via paral·lela - advanced_tooltip: Accions d'edició avançades - advanced_undelete: Restaura - advice_bendy: Massa corbes per a redreçar (shift per a forçar) - advice_conflict: Conflicte en el servidor - pot ser que hagi de guardar de nou - advice_deletingpoi: S'estan esborrant els punts d'interès (Z per desfer) - advice_deletingway: Esborra via (Z per desfer) - advice_microblogged: Actualitzat el seu estat de $1 - advice_nocommonpoint: Les vies no comparteixen un punt en comú - advice_revertingpoi: Tornant a l'últim punt d'inter'es que es va guardar. (Z per desfer) - advice_revertingway: Tornant a l'última via guardada (Z per desfer) - advice_tagconflict: Les etiquetes no coincideixen - si us plau revisi'ls (Z per desfer) - advice_toolong: Massa llarg per desbloquejar - si us plau, divideixi'l en vies més curtes - advice_uploadempty: No hi ha gens que pujar - advice_uploadfail: Pujada detinguda - advice_uploadsuccess: Totes les dades s'han tramès correctament - advice_waydragged: Via desplaçada (Z per desfer) - cancel: Cancel·la - closechangeset: Tanca conjunt de canvis - conflict_download: Descarrega la seva versió - conflict_overwrite: Sobreescriu la seva versió - conflict_poichanged: Des que vau començar a editar, algú ha canviat el punt $1$2. - conflict_relchanged: Des que vau començar a editar, algú ha canviat la relació $1$2. - conflict_visitpoi: Feu clic a 'D'acord' per mostrar el punt. - conflict_visitway: Cliqueu "D'acord" per mostrar la via. - conflict_waychanged: Des que va començar a editar, algú ha canviat la via $1$2. - createrelation: Crea una relació nova - custom: "Personalitzat:" - delete: Suprimeix - deleting: eliminar - drag_pois: Arrossegar i soltar punts d'interès - editinglive: Edició en viu - editingoffline: Edició fora de línia - emailauthor: Si us plau, enviï un correu a richard@systemeD.net amb un informe d'error, dient que el que estava fent en aquell moment. - error_anonymous: No pot contactar a un mapeador anònim - error_connectionfailed: Ho sentim - la connexió amb el servidor de OpenStreetMap va fallar. Qualsevol canvi recent no s'ha guardat. \n\nVoleu provar una altra vegada? - error_microblog_long: "L'enviament a $1 ha fallat:\ncodi HTTP: $2\nmissatge d'error: $3 \n$1 error: $4" - error_nopoi: El POI no es pot trobar (potser us heu mogut lluny?), així que no es pot desfer. - error_nosharedpoint: Les vies $1 i $2 ja no comparteixen cap punt en comú, així que no es pot desfer la divisió. - error_noway: La via $1 no es pot trobar (igual vostè s'ha desplaçat a una altra zona?), per tant no es pot desfer. - error_readfailed: Ho sentim - el servidor de OpenStreetMap no ha respost a la sol·licitud de dades.\n\nVoleu tornar a intentar? - existingrelation: Afegir a una relació existent - findrelation: Troba una relació que conté - gpxpleasewait: Si us plau, esperi mentre la traça GPX es processa. - heading_drawing: Dibuixant - heading_introduction: Introducció - heading_pois: Com començar - heading_quickref: Referència ràpida - heading_surveying: Recollida de dades - heading_tagging: Etiquetat - heading_troubleshooting: Solució de problemes - help: Ajuda - hint_drawmode: Feu clic per afegir un punt\ndoble clic/Intro\n per finalitzar la via - hint_latlon: "lat $1\nlon $2" - hint_loading: carregant dades - hint_overendpoint: sobre punt final ($1)\nfeu clic per unir\nshift-click per fusionar - hint_overpoint: sobre el punt ($1)\nFeu clic per unir - hint_pointselected: Punt seleccionat\n(fes shift-clic en el punt per\ncomençar una nova línia) - hint_saving: s'estan desant les dades - hint_saving_loading: pujant/descarregant dades - inspector: Inspector - inspector_duplicate: Duplicat de - inspector_in_ways: Dins vies - inspector_latlon: "Lat $1\nLon $2" - inspector_locked: Bloquejat - inspector_node_count: ($ 1 vegades) - inspector_not_in_any_ways: No està en cap via (POI) - inspector_unsaved: No s'ha desat - inspector_uploading: (pujant) - inspector_way_connects_to: Connecta amb $1 vies - inspector_way_connects_to_principal: Es connecta a $1 $2 i $3 altres $4 - inspector_way_nodes: $1 nodes - inspector_way_nodes_closed: $1 nodes (tancats) - loading: S'està carregant… - login_pwd: "Contrasenya:" - login_retry: El nom d'usuari no s'ha reconegut. Intenteu-ho de nou. - login_title: No s'ha pogut iniciar sessió - login_uid: "Nom d'usuari:" - mail: Correu - more: Més - newchangeset: "Si us plau, provi de nou: Potlatch començarà un nou conjunt de canvis" - "no": 'No' - nobackground: Sense fons - norelations: No hi ha relacions en l'àrea actual - offset_broadcanal: Camí de sirga ample - offset_choose: Trieu desplaçament - offset_dual: Carretera desdoblegada (D2) - offset_motorway: Autopista (D3) - offset_narrowcanal: Camí de sirga estret - ok: D'acord - openchangeset: Obre el conjunt de canvis - option_custompointers: Utilitza la ploma i la mà de punters - option_external: "Llançament extern:" - option_fadebackground: Atenuar el fons - option_layer_cycle_map: OSM - mapa ciclista - option_layer_maplint: OSM - Maplint (errors) - option_layer_nearmap: "Austràlia: NearMap" - option_layer_ooc_25k: "Històric del Regne Unit: 1:25k" - option_layer_ooc_7th: "Regne Unit històric: 7th" - option_layer_ooc_npe: "Regne Unit històric: NPE" - option_layer_ooc_scotland: "Regne Unit històric: Escòcia" - option_layer_os_streetview: "Regne Unit: OS StreetView" - option_layer_streets_haiti: "Haití: noms de carrers" - option_layer_surrey_air_survey: "Regne Unit: Mesurament aeri de Surrey" - option_layer_tip: Escollir el fons a mostrar - option_limitways: Avisar si hi ha molta càrrega de dades - option_microblog_id: "Nom microblog:" - option_microblog_pwd: "Contrasenya microblog:" - option_noname: Assenyala les carreteres sense nom - option_photo: "Foto KML:" - option_thinareas: Usa línies més fines per a àrees - option_thinlines: Utilitza línies fines en totes les escales - option_tiger: Ressalta TIGER sense canvis - option_warnings: Mostra advertències flotants - point: Punt - preset_icon_airport: Aeroport - preset_icon_bar: Bar - preset_icon_bus_stop: Parada d'autobús - preset_icon_cafe: Cafè - preset_icon_cinema: Cinema - preset_icon_convenience: Adrogueria - preset_icon_disaster: Edifici d'Haití - preset_icon_fast_food: Menjar ràpid - preset_icon_ferry_terminal: Ferri - preset_icon_fire_station: Parc de bombers - preset_icon_hospital: Hospital - preset_icon_hotel: Hotel - preset_icon_museum: Museu - preset_icon_parking: Pàrquing - preset_icon_pharmacy: Farmàcia - preset_icon_place_of_worship: Lloc de culte - preset_icon_police: Comissaria de policia - preset_icon_post_box: Bústia de correus - preset_icon_pub: Pub - preset_icon_recycling: Reciclatge - preset_icon_restaurant: Restaurant - preset_icon_school: Escola - preset_icon_station: Estació de ferrocarril - preset_icon_supermarket: Supermercat - preset_icon_taxi: Parada de taxis - preset_icon_telephone: Telèfon - preset_icon_theatre: Teatre - preset_tip: Trieu entre un menú d'etiquetes preestablertes que descriguin $1 - prompt_addtorelation: Afegit $1 a la relació - prompt_changesetcomment: "Introduïu una descripció dels canvis:" - prompt_closechangeset: Tanca conjunt de canvis $1 - prompt_createparallel: Crea una via paral.lela - prompt_editlive: Edició en viu - prompt_editsave: Edició amb guardar - prompt_helpavailable: Sou un usuari nou? Mireu a la part inferior esquerra per obtenir ajuda. - prompt_launch: Obrir URL externa - prompt_live: En el mode directe, cada canvi realitzat es guardarà instantàniament en la base de dades de OpenStreetMap - això no es recomana a principiants. Estàs segur? - prompt_manyways: Aquesta àrea conté molts detalls i trigarà molt en carregar-se. Preferiu fer un zoom? - prompt_microblog: Enviat a $1 ($2 restants) - prompt_revertversion: Torna a una versió prèviament guardada - prompt_savechanges: Guardar canvis - prompt_taggedpoints: Algun dels punts d'aquesta via tenen etiquetes o estan en una relació. Realment voleu esborrar-los? - prompt_track: Converteix traces GPS a vies - prompt_unlock: Feu clic per desbloquejar - prompt_welcome: Benvingut/da a l'OpenStreetMap! - retry: Reintenta - revert: Reverteix - save: Desa - tags_backtolist: Torna a la llista - tags_descriptions: Descripcions de '$1' - tags_findatag: Troba una etiqueta - tags_findtag: Cerca una etiqueta - tags_matching: Etiquetes populars que coincideixen amb '$1' - tags_typesearchterm: "Introdueixi una paraula per a buscar:" - tip_addrelation: Afegir a una relació - tip_addtag: Afegeix una nova etiqueta - tip_alert: Ha ocorregut un error - feu clic per a detalls - tip_anticlockwise: Via circular en el sentit contrari de les agulles del rellotge - clic per invertir - tip_clockwise: Via circular en el sentit de les agulles del rellotge - feu clic per a invertir l'adreça de la via - tip_direction: Direcció de la via - feu clic per invertir-la - tip_gps: Mostra les traces de GPS (G) - tip_noundo: No hi ha res a desfer - tip_options: Estableix les opcions (tria el fons del mapa) - tip_photo: Carrega les fotos - tip_presettype: Escollir quin tipus de etiquetes preestablertes s'ofereixen en el menú. - tip_repeattag: Repeteix les etiquetes de la via seleccionada prèviament (R) - tip_revertversion: Trii la data a la qual tornar - tip_selectrelation: Afegir a la ruta escollida - tip_splitway: Divideix la via en el punt seleccionat (X) - tip_tidy: Simplifica punts en una via (T) - tip_undo: Desfés $1 (Z) - uploading: Carregant... - uploading_deleting_pois: Esborrant POIs - uploading_deleting_ways: Esborrant vies - uploading_poi: Pujant punt d'interés $1 - uploading_poi_name: Pujant POI $1, $2 - uploading_relation: Pujant relació $1 - uploading_relation_name: Pujant relació $1, $2 - uploading_way: Pujant via $1 - uploading_way_name: S'està pujant la via $1, $2 - warning: Atenció! - way: Via - "yes": Sí diff --git a/config/potlatch/locales/cs.yml b/config/potlatch/locales/cs.yml deleted file mode 100644 index 2fe51144f..000000000 --- a/config/potlatch/locales/cs.yml +++ /dev/null @@ -1,230 +0,0 @@ -# Messages for Czech (Česky) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Jkjk -# Author: Mormegil -# Author: Utar -cs: - a_poi: $1 bod zájmu - a_way: $1 cestu - action_addpoint: přidávání uzlu na konec cesty - action_cancelchanges: zrušení změn do - action_changeway: změny cesty - action_createparallel: vytvoření rovnoběžných cest - action_createpoi: vytváření bodu zájmu (POI) - action_deletepoint: odstraňuji bod - action_insertnode: přidávání uzle do cesty - action_mergeways: sloučení dvou cest - action_movepoi: posunutí bodu záju (POI) - action_movepoint: posouvám bod - action_moveway: přesunout cestu - action_pointtags: nastavit tagy uzlu - action_poitags: nastavit tagy bodu zájmu - action_reverseway: otočit směr cesty - action_revertway: otočit směr cesty - action_splitway: rozděluji cestu - action_waytags: úprava tagů cesty - advanced: Rozšířené - advanced_close: Zavřít sadu změn - advanced_history: Historie cesty - advanced_inspector: Kontrola - advanced_maximise: Maximalizovat okno - advanced_minimise: Minimalizovat okno - advanced_parallel: Rovnoběžná cesta - advanced_tooltip: Rozšířené úpravy - advanced_undelete: Obnovit - advice_bendy: Příliš křivolaká pro narování (SHIFT pro vynucení) - advice_conflict: Konflikt na serveru - asi budete muset zkusit znovu uložit - advice_deletingpoi: Mazání POI (Z pro krok zpět) - advice_deletingway: Vymazání cesty (Z pro vrácení) - advice_microblogged: Aktualizován váš $1 status - advice_nocommonpoint: Cesty nesdílí společný bod - advice_revertingpoi: Vrátit se k poslednímu uloženému POI (Z pro krok zpět) - advice_revertingway: Vrátit se k poslední uložené cestě (Z pro krok zpět) - advice_tagconflict: Tagy nepasují - prosím zkontrolujte - advice_toolong: Příliš dlouhé pro odemčení - prosím rozdělte do kratších cest - advice_uploadempty: Nic k nahrání - advice_uploadfail: Nahrávání zastaveno - advice_uploadsuccess: Všechna data byla úspěšně nahrána - advice_waydragged: Cesta posunuta (Z pro odvolání změny) - cancel: Zrušit - closechangeset: Zavřt sadu změn - conflict_download: Stáhnout jejich verzi - conflict_overwrite: Přepsat jejich verzi - conflict_poichanged: Během vašeho editování někdo změnil bod $1$2. - conflict_relchanged: Během vašeho editování někdo změnil relaci $1$2. - conflict_visitpoi: Klikněte na 'Ok' pro zobrazení bodu. - conflict_visitway: Klikněte na 'Ok' pro zobrazení cesty. - conflict_waychanged: Během vašeho editování někdo změnil cestu $1$2. - createrelation: Vytvořit novou relaci - custom: "Vlastní:" - delete: Smazat - deleting: mazání - drag_pois: Klikněte a přetáhněte body zájmu (POI) - editinglive: "Režim editace: okamžité ukládání" - editingoffline: "Režim editace: uložení najednou" - emailauthor: \n\nProsím pošlete e-mail na richard\@systemeD.net s bug-reportem a popisem toho, co jste právě dělali. Pokud nemluvíte anglicky, napište na talk-cz\@openstreetmap.org - error_anonymous: Nemůžete kontaktovat anonymního uživatele. - error_connectionfailed: "Spojení s OpenStreetMap serverem selhalo. Vaše nedávné změny nemohly být uloženy.\n\nZkusit uložit změny znovu?" - error_microblog_long: "Posílání na $1 selhalo:\nKód HTTP: $2\nChybová zpráva: $3\n$1 chyba: $4" - error_nopoi: Bod zájmu nebyl nalezen, takže nelze vrátit zpět (možná jste posunuli mapu?). - error_nosharedpoint: Cesty $1 a $2 v současnosti nemaí společný bod, takže nemůžu vrátit zpět. - error_noway: Cesta $1 nebyla nalezena, takže nelze vrátit zpět (možná jste posunuli mapu?). - error_readfailed: Omlouváme se - server OpenStreetMap neodpověděl na žádost o údaje.\n\nBudete to chtít zkusit znovu? - existingrelation: Přidat k existující relaci - findrelation: Najít relaci obsahující - gpxpleasewait: "Počkejte prosím: Zpracovávám GPX cestu" - heading_drawing: Kreslení - heading_introduction: Úvod - heading_pois: Začínáme - heading_quickref: Rychlý odkaz - heading_surveying: Teréní průzkum - heading_tagging: Tagování - heading_troubleshooting: Řešení problémů - help: Nápověda - hint_drawmode: přidej bod kliknutím\ndvojklik/Enter\nukončí cestu - hint_latlon: "zeměpisná šířka $1\nzeměpisná délka $2" - hint_loading: načítám cesty - hint_overendpoint: "koncový bod:\nkliknutí pro napojení,\nshift-klik cesty sloučí" - hint_overpoint: bod cesty:\nkliknutím cestu napojíte" - hint_pointselected: vybrán bod\n(shift-klik na bod\nzačne novou cestu) - hint_saving: ukládám data - hint_saving_loading: načítání/ukládání dat - inspector: Kontrola - inspector_duplicate: Duplikát - inspector_in_ways: V cestách - inspector_latlon: "zeměpisná šířka $1\nzeměpisná délka $2" - inspector_locked: Uzamčeno - inspector_node_count: ($1 krát) - inspector_not_in_any_ways: Není v žádné cestě (POI) - inspector_unsaved: Neuloženo - inspector_uploading: (nahrávání) - inspector_way_connects_to: Spojuje se do $1 cest - inspector_way_connects_to_principal: Spojuje se s $1 $2 a $3 další $4 - inspector_way_nodes: $1 bodů - inspector_way_nodes_closed: $1 bodů (uzavřeno) - loading: Načítá se… - login_pwd: "Heslo:" - login_retry: Vaše přihlášení nebylo rozpoznáno. Zkuste to prosím znovu. - login_title: Nelze se přihlásit - login_uid: "Uživatelské jméno:" - mail: E-mail - more: Více - newchangeset: "Prosím zkuste to znovu: Potlatch založí novou sadu změn." - "no": Ne - nobackground: Bez pozadí - norelations: V aktuální datech není žádná relace - offset_broadcanal: Cesta podél širokého kanálu - offset_choose: Zvolte posun (m) - offset_dual: Čtyřpruhová silnice (D2) - offset_motorway: Dálnice (D3) - offset_narrowcanal: Cesta podél úzkého kanálu - ok: Budiž - openchangeset: Otevírám changeset - option_custompointers: Použít ukazatele kreslítka (pen) a ruky (hand) - option_external: "Externí spuštění:" - option_fadebackground: Zesvětlit pozadí - option_layer_cycle_map: OSM - cyklomapa - option_layer_maplint: OSM - Maplint (chyby) - option_layer_nearmap: "Austrálie: NearMap" - option_layer_ooc_25k: "VB historická: 1:25000" - option_layer_ooc_7th: "VB historická: 7." - option_layer_ooc_npe: "VB historická: NPE" - option_layer_ooc_scotland: "VB historická: Skotsko" - option_layer_os_streetview: "VB: OS StreetView" - option_layer_streets_haiti: "Haiti: názvy ulic" - option_layer_surrey_air_survey: "VB: Surrey Air Survey" - option_layer_tip: Vyberte pozadí, které chcete zobrazit - option_limitways: Upozornit při načítání velkého množství dat - option_microblog_id: "Název mikroblogu:" - option_microblog_pwd: "Heslo Mikroblogu:" - option_noname: Zvýraznit nepojmenované silnice - option_photo: "KML k fotografiím:" - option_thinareas: Použí tenčí čáry pro plochy - option_thinlines: Používat tenké linky ve všech měřítkách mapy - option_tiger: Zvýraznit nezměněná data z importu TIGER - option_warnings: Zobrazovat plovoucí varování - point: Bod - preset_icon_airport: Letiště - preset_icon_bar: Bar - preset_icon_bus_stop: Autobusová zastávka - preset_icon_cafe: Kavárna - preset_icon_cinema: Kino - preset_icon_convenience: Smíšené zboží - preset_icon_disaster: Budova na Haiti - preset_icon_fast_food: Rychlé občerstvení - preset_icon_ferry_terminal: Přívoz - preset_icon_fire_station: Hasičská stanice - preset_icon_hospital: Nemocnice - preset_icon_hotel: Hotel - preset_icon_museum: Muzeum - preset_icon_parking: Parkoviště - preset_icon_pharmacy: Lékárna - preset_icon_place_of_worship: Náboženský objekt - preset_icon_police: Policejní stanice - preset_icon_post_box: Poštovní schránka - preset_icon_pub: Hospoda - preset_icon_recycling: Tříděný odpad - preset_icon_restaurant: Restaurace - preset_icon_school: Škola - preset_icon_station: Železniční stanice - preset_icon_supermarket: Supermarket - preset_icon_taxi: Stanoviště taxíků - preset_icon_telephone: "Telefón:" - preset_icon_theatre: Divadlo - preset_tip: Vyberte si z nabídky přednastavených tagů popisujících $1 - prompt_addtorelation: Přidat $1 k relace - prompt_changesetcomment: "Napište shrnutí provedených změn:" - prompt_closechangeset: Zavřít sadu změn $1 - prompt_createparallel: Vytvořit rovnoběžnou cestu - prompt_editlive: Ukládat okamžitě - prompt_editsave: Ukládat najednou - prompt_helpavailable: Nový uživatel editoru? Nápovědu najdete vpravo dole. - prompt_launch: Otevřít externí webovou adresu? - prompt_live: V režimu editace okamžité ukládání každá položka, kterou změníte, bude ihned uložena do databáze OpenStreetMap. Proto tento režim není vhodný pro začátečníky. Myslíte to vážně? - prompt_manyways: Tato oblast je velmi detailně zpracovaná, a proto se bude načítat dlouho. Nechcete raději priblížit? - prompt_microblog: Vystavit na $1 (zbývá $2) - prompt_revertversion: "Vrátit se ke dříve uložené verzi:" - prompt_savechanges: Uložit změny - prompt_taggedpoints: Některé body na této cestě jsou označené nebo v relacích. Opravdu smazat? - prompt_track: Převede vaši GPS stopu na (uzamčené) cesty, které následně můžete upravit. - prompt_unlock: Klikněte pro odemčení - prompt_welcome: Vítejte na OpenStreetMap - retry: Zkusit znovu - revert: Vrátit zpět - save: Uložit změny - tags_backtolist: Zpět na seznam - tags_descriptions: Popis '$1' - tags_findatag: Najít tag - tags_findtag: Najít tag - tags_matching: Často používané tagy obsahující '$1' - tags_typesearchterm: "Zadejte slovo, které se má hledat:" - tip_addrelation: Přidat do relace - tip_addtag: Přidat tag - tip_alert: Vyskyla se chyba - pro více informací klikněte - tip_anticlockwise: Proti směru hodinových ručiček (kliknutím otočíte směr kruhové cesty) - tip_clockwise: Po směru hodinových ručiček (kliknutím otočíte směr kruhové cesty) - tip_direction: Směr cesty (kliknutím otočíte) - tip_gps: Zobrazit GPS stopy (G) - tip_noundo: Není, co vzít zpět - tip_options: Možnosti (vyberte si mapu na pozadí) - tip_photo: Načíst fotografie - tip_presettype: Zvolit skupinu předvoleb v menu. - tip_repeattag: Nastavit tagy předtím vybrané cesty(R) - tip_revertversion: "Vyberte verzi, ke které se chcete vrátit:" - tip_selectrelation: Přidat k vybrané cestě - tip_splitway: Rozdělit cestu ve vybraném bodě (X) - tip_tidy: Uspořádat body v cestě (T) - tip_undo: "Zpět: $1 (Z)" - uploading: Nahrávám ... - uploading_deleting_pois: Mazání POI - uploading_deleting_ways: Mazání cest - uploading_poi: Nahrávání POI $1 - uploading_poi_name: Nahrávání POI $1, $2 - uploading_relation: Nahrávání relace $1 - uploading_relation_name: Nahrávání relace $1, $2 - uploading_way: Nahrávání cesty $1 - uploading_way_name: Narávání cest $1, $2 - warning: Upozornění ! - way: Cesta - "yes": Ano diff --git a/config/potlatch/locales/da.yml b/config/potlatch/locales/da.yml deleted file mode 100644 index d73e69956..000000000 --- a/config/potlatch/locales/da.yml +++ /dev/null @@ -1,232 +0,0 @@ -# Messages for Danish (Dansk) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Ebbe -# Author: Emilkris33 -# Author: OleLaursen -# Author: Winbladh -da: - a_poi: $1 et POI - a_way: $1 en vej - action_addpoint: tilføjer et punkt til enden af en vej - action_cancelchanges: afbryder ændringer af - action_changeway: ændringer til en vej - action_createparallel: skaber parallelle veje - action_createpoi: lave et POI (interessant punkt) - action_deletepoint: sletter et punkt - action_insertnode: tilføj et punkt på vejen - action_mergeways: slår to veje sammen - action_movepoi: flytter et POI (interessant punkt) - action_movepoint: flytter et punkt - action_moveway: flytter en vej - action_pointtags: sætter tags på et punkt - action_poitags: sætter tags på et POI (interessant punkt) - action_reverseway: vend retningen på en vej - action_revertway: returnere en vej - action_splitway: del en vej - action_waytags: sætter tags på en vej - advanced: Avanceret - advanced_close: Luk Changeset - advanced_history: Vej historie - advanced_inspector: Inspector - advanced_maximise: Maksimer vinduet - advanced_minimise: Minimer vindue - advanced_parallel: Parallel vej - advanced_tooltip: Avanceret redigerings aktioner - advanced_undelete: Genopret - advice_bendy: For krum til at rette ud (SHIFT at tvinge) - advice_conflict: Server konflikt - det kan være nødvendigt, at prøve at gemme igen - advice_deletingpoi: Sletning af POI (Z for at fortryde) - advice_deletingway: Sletter vej (Z for at fortryde) - advice_microblogged: Opdateret din $1 status - advice_nocommonpoint: Vejene deler ikke et fælles punkt - advice_revertingpoi: Vende tilbage til sidst gemte POI (Z for at fortryde) - advice_revertingway: Vender tilbage til sidst gemte vej (Z for at fortryde) - advice_tagconflict: Tags matcher ikke - venligst kontrollere (Z for at fortryde) - advice_toolong: For lang for låse op - venligst opdel i kortere veje - advice_uploadempty: Intet at uploade - advice_uploadfail: Upload stoppet - advice_uploadsuccess: Alle data uploadet succesfuldt - advice_waydragged: Way flyttet (Z for at fortryde) - cancel: Afbryd - closechangeset: Lukker Changeset - conflict_download: Download deres version - conflict_overwrite: Overskriv deres version - conflict_poichanged: Siden du begyndte at redigere, har en anden ændret punkt $ 1 $ 2. - conflict_relchanged: Siden du begyndte at redigere, har en anden ændret relation $1 $2. - conflict_visitpoi: Klik på 'OK' for at vise punkt. - conflict_visitway: Klik på 'Ok' for at vise vejen. - conflict_waychanged: Siden du begyndte at redigere, har en anden ændret vej $1 $2. - createrelation: Lav en ny relation - custom: "Custom:" - delete: Slet - deleting: sletter - drag_pois: Træk og slip punkter af interesse (POI) - editinglive: Live redigering - editingoffline: Redigering offline - emailauthor: \n\nVenligst send en e-mail (på engelsk) til richard\@systemeD.net med en fejlrapport, og forklar hvad du gjorde da det skete. - error_anonymous: Du kan ikke kontakte en anonym Mapper. - error_connectionfailed: Beklager - forbindelsen til OpenStreetMap-serveren fejlede, eventuelle nye ændringer er ikke blevet gemt. \n\nVil du prøve igen? - error_microblog_long: "Posting til $1 fejlede: \nHTTP-kode: $2 \nFejlmeddelelse: $3 \n$1 fejl: $ 4" - error_nopoi: Fandt ikke POI-et, så det er ikke muligt at fortryde. (Måske er den ikke på skærmen længere?) - error_nosharedpoint: Vejene $1 og $2 deler ikke noget punkt længere, så det er ikke muligt at fortryde delingen. - error_noway: Fandt ikke vejen $1 så det er ikke muligt at fortryde. (Måske er den ikke på skærmen længere?) - error_readfailed: Beklager - OpenStreetMap-serveren reagere ikke.\n\nVil du prøve igen? - existingrelation: Føj til en eksisterende relation - findrelation: Find en relation som indeholder - gpxpleasewait: Vent venligst mens GPX sporet behandles. - heading_drawing: Tegning - heading_introduction: Indledning - heading_pois: Kom godt i gang - heading_quickref: Hurtig reference - heading_surveying: Undersøge - heading_tagging: Tagging - heading_troubleshooting: Fejlfinding - help: Hjælp - help_html: "Velkommen til Potlatch\nPotlatch er nem editor til OpenStreetMap. Tegn veje, stier, vartegn og butikker fra din GPS undersøgelser, satellitbilleder eller gamle kort.\n\nDisse hjælpe sider vil tage dig gennem den grundlæggende brug af Potlatch, og fortælle dig hvor man kan finde ud af mere. Klik på overskrifterne ovenfor for at begynde.\n\nWhen you've finished, just click anywhere else on the page.\n\n\n\nUseful stuff to know\nDu må ikke kopiere fra andre kort!\n\nIf you choose 'Edit live', any changes you make will go into the database as you draw them - like, immediately. If you're not so confident, choose 'Edit with save', and they'll only go in when you press 'Save'.\n\nAny edits you make will usually be shown on the map after an hour or two (a few things take a week). Not everything is shown on the map - it would look too messy. But because OpenStreetMap's data is open source, other people are free to make maps showing different aspects - like OpenCycleMap or Midnight Commander.\n\nRemember it's both a good-looking map (so draw pretty curves for bends) and a diagram (so make sure roads join at junctions).\n\nFik vi nævnt at man ikke må kopiere fra andre kort?\n\n\nFind ud af mere\nPotlatch manual\nPostlister\nOnline chat (live hjælp)\nWeb forum\nCommunity wiki\nPotlatch kildekode\n\n\n\nKom godt i gang\nNu hvor du har Potlatch åbne, skal du klikke på 'Rediger med Gem' for at komme i gang.\n\nSå du er klar til at tegne et kort. Den nemmeste sted at starte, er ved at placere nogle interessepunkter (POI) på kortet. Disse kan være pubber, kirker, banegårde ... hvad den end kan lide.\n\nTræk og slip\nTo make it super-easy, you'll see a selection of the most common POIs, right at the bottom of the map for you. Putting one on the map is as easy as dragging it from there onto the right place on the map. And don't worry if you don't get the position right first time: you can drag it again until it's right. Note that the POI is highlighted in yellow to show that it's selected.\n\nOnce you've done that, you'll want to give your pub (or church, or station) a name. You'll see that a little table has appeared at the bottom. One of the entries will say \"name\" followed by \"(type name here)\". Do that - click that text, and type the name.\n\nClick somewhere else on the map to deselect your POI, and the colourful little panel returns.\n\nEasy, isn't it? Click 'Save' (bottom right) when you're done.\nMoving around\nTo move to a different part of the map, just drag an empty area. Potlatch will automatically load the new data (look at the top right).\n\nWe told you to 'Edit with save', but you can also click 'Edit live'. If you do this, your changes will go into the database straightaway, so there's no 'Save' button. This is good for quick changes and mapping parties.\n\nNext steps\nHappy with all of that? Great. Click 'Surveying' above to find out how to become a real mapper!\n\nSurveying with a GPS\nThe idea behind OpenStreetMap is to make a map without the restrictive copyright of other maps. This means you can't copy from elsewhere: you must go and survey the streets yourself. Fortunately, it's lots of fun!\nThe best way to do this is with a handheld GPS set. Find an area that isn't mapped yet, then walk or cycle up the streets with your GPS switched on. Note the street names, and anything else interesting (pubs? churches?) , as you go along.\n\nWhen you get home, your GPS will contain a 'tracklog' recording everywhere you've been. You can then upload this to OpenStreetMap.\n\nThe best type of GPS is one that records to the tracklog frequently (every second or two) and has a big memory. Lots of our mappers use handheld Garmins or little Bluetooth units. There are detailed GPS Reviews on our wiki.\n\nUploading your track\nNow, you need to get your track off the GPS set. Maybe your GPS came with some software, or maybe it lets you copy the files off via USB. If not, try GPSBabel. Whatever, you want the file to be in GPX format.\n\nThen use the 'GPS Traces' tab to upload your track to OpenStreetMap. But this is only the first bit - it won't appear on the map yet. You must draw and name the roads yourself, using the track as a guide.\nUsing your track\nFind your uploaded track in the 'GPS Traces' listing, and click 'edit' right next to it. Potlatch will start with this track loaded, plus any waypoints. You're ready to draw!\n\nYou can also click this button to show everyone's GPS tracks (but not waypoints) for the current area. Hold Shift to show just your tracks.\nUsing satellite photos\nIf you don't have a GPS, don't worry. In some cities, we have satellite photos you can trace over, kindly supplied by Yahoo! (thanks!). Go out and note the street names, then come back and trace over the lines.\n\nIf you don't see the satellite imagery, click the options button and make sure 'Yahoo!' is selected. If you still don't see it, it's probably not available for your city, or you might need to zoom out a bit.\n\nOn this same options button you'll find a few other choices like an out-of-copyright map of the UK, and OpenTopoMap for the US. These are all specially selected because we're allowed to use them - don't copy from anyone else's maps or aerial photos. (Copyright law sucks.)\n\nSometimes satellite pics are a bit displaced from where the roads really are. If you find this, hold Space and drag the background until it lines up. Always trust GPS tracks over satellite pics.\n\nDrawing ways\nTo draw a road (or 'way') starting at a blank space on the map, just click there; then at each point on the road in turn. When you've finished, double-click or press Enter - then click somewhere else to deselect the road.\n\nTo draw a way starting from another way, click that road to select it; its points will appear red. Hold Shift and click one of them to start a new way at that point. (If there's no red point at the junction, shift-click where you want one!)\n\nClick 'Save' (bottom right) when you're done. Save often, in case the server has problems.\n\nDon't expect your changes to show instantly on the main map. It usually takes an hour or two, sometimes up to a week.\nMaking junctions\nIt's really important that, where two roads join, they share a point (or 'node'). Route-planners use this to know where to turn.\n\nPotlatch takes care of this as long as you are careful to click exactly on the way you're joining. Look for the helpful signs: the points light up blue, the pointer changes, and when you're done, the junction point has a black outline.\nMoving and deleting\nThis works just as you'd expect it to. To delete a point, select it and press Delete. To delete a whole way, press Shift-Delete.\n\nTo move something, just drag it. (You'll have to click and hold for a short while before dragging a way, so you don't do it by accident.)\nMore advanced drawing\nIf two parts of a way have different names, you'll need to split them. Click the way; then click the point where it should be split, and click the scissors. (You can merge ways by clicking with Control, or the Apple key on a Mac, but don't merge two roads of different names or types.)\n\nRoundabouts are really hard to draw right. Don't worry - Potlatch can help. Just draw the loop roughly, making sure it joins back on itself at the end, then click this icon to 'tidy' it. (You can also use this to straighten out roads.)\nPoints of interest\nThe first thing you learned was how to drag-and-drop a point of interest. You can also create one by double-clicking on the map: a green circle appears. But how to say whether it's a pub, a church or what? Click 'Tagging' above to find out!\n\nWhat type of road is it?\nOnce you've drawn a way, you should say what it is. Is it a major road, a footpath or a river? What's its name? Are there any special rules (e.g. \"no bicycles\")?\n\nIn OpenStreetMap, you record this using 'tags'. A tag has two parts, and you can have as many as you like. For example, you could add highway | trunk to say it's a major road; highway | residential for a road on a housing estate; or highway | footway for a footpath. If bikes were banned, you could then add bicycle | no. Then to record its name, add name | Market Street.\n\nThe tags in Potlatch appear at the bottom of the screen - click an existing road, and you'll see what tags it has. Click the '+' sign (bottom right) to add a new tag. The 'x' by each tag deletes it.\n\nYou can tag whole ways; points in ways (maybe a gate or a traffic light); and points of interest.\nUsing preset tags\nTo get you started, Potlatch has ready-made presets containing the most popular tags.\n\nSelect a way, then click through the symbols until you find a suitable one. Then, choose the most appropriate option from the menu.\n\nThis will fill the tags in. Some will be left partly blank so you can type in (for example) the road name and number.\nOne-way roads\nYou might want to add a tag like oneway | yes - but how do you say which direction? There's an arrow in the bottom left that shows the way's direction, from start to end. Click it to reverse.\nChoosing your own tags\nOf course, you're not restricted to just the presets. By using the '+' button, you can use any tags at all.\n\nYou can see what tags other people use at OSMdoc, and there is a long list of popular tags on our wiki called Map Features. But these are only suggestions, not rules. You are free to invent your own tags or borrow from others.\n\nBecause OpenStreetMap data is used to make many different maps, each map will show (or 'render') its own choice of tags.\nRelations\nSometimes tags aren't enough, and you need to 'group' two or more ways. Maybe a turn is banned from one road into another, or 20 ways together make up a signed cycle route. You can do this with an advanced feature called 'relations'. Find out more on the wiki.\n\nUndoing mistakes\nThis is the undo button (you can also press Z) - it will undo the last thing you did.\n\nYou can 'revert' to a previously saved version of a way or point. Select it, then click its ID (the number at the bottom left) - or press H (for 'history'). You'll see a list of everyone who's edited it, and when. Choose the one to go back to, and click Revert.\n\nIf you've accidentally deleted a way and saved it, press U (for 'undelete'). All the deleted ways will be shown. Choose the one you want; unlock it by clicking the red padlock; and save as usual.\n\nThink someone else has made a mistake? Send them a friendly message. Use the history option (H) to select their name, then click 'Mail'.\n\nUse the Inspector (in the 'Advanced' menu) for helpful information about the current way or point.\nFAQs\nHow do I see my waypoints?\nWaypoints only show up if you click 'edit' by the track name in 'GPS Traces'. The file has to have both waypoints and tracklog in it - the server rejects anything with waypoints alone.\n\nMore FAQs for Potlatch and OpenStreetMap.\n\n\n\nWorking faster\nThe further out you're zoomed, the more data Potlatch has to load. Zoom in before clicking 'Edit'.\n\nTurn off 'Use pen and hand pointers' (in the options window) for maximum speed.\n\nIf the server is running slowly, come back later. Check the wiki for known problems. Some times, like Sunday evenings, are always busy.\n\nTell Potlatch to memorise your favourite sets of tags. Select a way or point with those tags, then press Ctrl, Shift and a number from 1 to 9. Then, to apply those tags again, just press Shift and that number. (They'll be remembered every time you use Potlatch on this computer.)\n\nTurn your GPS track into a way by finding it in the 'GPS Traces' list, clicking 'edit' by it, then tick the 'convert' box. It'll be locked (red) so won't save. Edit it first, then click the red padlock to unlock when ready to save.\n\nWhat to click\nDrag the map to move around.\nDouble-click to create a new POI.\nSingle-click to start a new way.\nHold and drag a way or POI to move it.\nWhen drawing a way\nDouble-click or press Enter to finish drawing.\nClick another way to make a junction.\nShift-click the end of another way to merge.\nWhen a way is selected\nClick a point to select it.\nShift-click in the way to insert a new point.\nShift-click a point to start a new way from there.\nControl-click another way to merge.\n\nKeyboard shortcuts\nB Add background source tag\nC Close changeset\nG Show GPS tracks\nH Show history\nI Show inspector\nJ Join point to what's below ways\n(+Shift) Unjoin from other ways\nK Lock/unlock current selection\nL Show current latitude/longitude\nM Maximise editing window\nP Create parallel way\nR Repeat tags\nS Save (unless editing live)\nT Tidy into straight line/circle\nU Undelete (show deleted ways)\nX Cut way in two\nZ Undo\n- Remove point from this way only\n+ Add new tag\n/ Select another way sharing this point\nDelete Delete point\n (+Shift) Delete entire way\nReturn Finish drawing line\nSpace Hold and drag background\nEsc Abort this edit; reload from server\n0 Remove all tags\n1-9 Select preset tags\n (+Shift) Select memorised tags\n (+S/Ctrl) Memorise tags\n§ or ` Cycle between tag groups\n\n" - hint_drawmode: klik for at tilføje punkt\ndobbeltklik eller enter\nfor at afslutte linie - hint_latlon: "breddegrad (lat) $1 \nlængdegrad (lon) $2" - hint_loading: henter veje - hint_overendpoint: over endepunkt\nklik for at forbinde\nshift+klik for at slå sammen til en - hint_overpoint: over punkt\nklik for at forbinde - hint_pointselected: punkt valgt\n(shift+klik punktet for at\nstarte en ny linie) - hint_saving: gemmer data - hint_saving_loading: loader/gemmer data - inspector: Inspektor - inspector_duplicate: Duplikat af - inspector_in_ways: I veje - inspector_latlon: "Breddegrad (Lat) $1 \nLængdegrad (Lon) $2" - inspector_locked: Låst - inspector_node_count: ($1 gange) - inspector_not_in_any_ways: Ikke på nogen veje (POI) - inspector_unsaved: Ikke gemt - inspector_uploading: (Uploading) - inspector_way_connects_to: Forbinder til $1 veje - inspector_way_connects_to_principal: Forbinder til $1 $2 og $3 andre $4 - inspector_way_nodes: $1 knudepunkter - inspector_way_nodes_closed: $1 noder (lukkede) - loading: Loading ... - login_pwd: "Password:" - login_retry: Dit login blev ikke genkendt. Prøv venligst igen. - login_title: Kunne ikke logge ind - login_uid: "Brugernavn:" - mail: Post - more: Mere - newchangeset: "Prøv venligst igen: Potlatch vil starte et nyt changeset.." - "no": Nej - nobackground: Ingen baggrund - norelations: Ingen relationer i området på skærmen - offset_broadcanal: Bred kanal træksti - offset_choose: Vælg offset (m) - offset_dual: Dobbelt vej (D2) - offset_motorway: Motorvej (D3) - offset_narrowcanal: Smal kanalen træksti - ok: Ok - openchangeset: Åbner Changeset - option_custompointers: Brug pen- og håndvisere - option_external: "Ekstern launch:" - option_fadebackground: Fjern baggrund - option_layer_cycle_map: OSM - cykel kort - option_layer_maplint: OSM - Maplint (fejl) - option_layer_nearmap: "Australien: NearMap" - option_layer_ooc_25k: "UK historisk: 1:25 k" - option_layer_ooc_7th: "UK historisk: 7." - option_layer_ooc_npe: "UK historisk: NPE" - option_layer_ooc_scotland: "UK historisk: Skotland" - option_layer_os_streetview: "UK: OS StreetView" - option_layer_streets_haiti: "Haiti: gadenavne" - option_layer_surrey_air_survey: "UK: Surrey Air Survey" - option_layer_tip: Vælg baggrunden til visning - option_limitways: Advar ved loading af masser af data - option_microblog_id: "Microblog navn:" - option_microblog_pwd: "Microblog password:" - option_noname: Fremhæv unavngivene veje - option_photo: "Foto KML:" - option_thinareas: Brug tyndere linjer for områder - option_thinlines: Brug tynde linier uanset skalering - option_tiger: Fremhæv uændret TIGER - option_warnings: Vis flydende advarsler - point: Punkt - preset_icon_airport: Lufthavn - preset_icon_bar: Bar - preset_icon_bus_stop: Busstoppested - preset_icon_cafe: Café - preset_icon_cinema: Biograf - preset_icon_convenience: Dagligvare butik - preset_icon_disaster: Haiti bygning - preset_icon_fast_food: Fast food - preset_icon_ferry_terminal: Færge - preset_icon_fire_station: Brandstation - preset_icon_hospital: Hospital - preset_icon_hotel: Hotel - preset_icon_museum: Museum - preset_icon_parking: Parkering - preset_icon_pharmacy: Apotek - preset_icon_place_of_worship: Sted for tilbedelse - preset_icon_police: Politistation - preset_icon_post_box: Postkasse - preset_icon_pub: Pub - preset_icon_recycling: Genbrug - preset_icon_restaurant: Restaurant - preset_icon_school: Skole - preset_icon_station: Togstation - preset_icon_supermarket: Supermarked - preset_icon_taxi: Taxaholdeplads - preset_icon_telephone: Telefon - preset_icon_theatre: Teater - preset_tip: Vælg fra menuen af preset tags, der beskriver $1 - prompt_addtorelation: Tilføj $1 til en relation - prompt_changesetcomment: "Indtast en beskrivelse af dine ændringer:" - prompt_closechangeset: Luk Changeset $1 - prompt_createparallel: Opret parallel vej - prompt_editlive: Edit live - prompt_editsave: Rediger med gem - prompt_helpavailable: Ny bruger? Kig nederst til venstre for at få hjælp. - prompt_launch: Start ekstern URL - prompt_live: I live-mode, vil hver punkt du ændre, straks blive gemt i OpenStreetMap databasen - anbefales ikke til begyndere. Er du sikker? - prompt_manyways: Dette område er meget detaljerede, og vil tage lang tid at hente. Foretrækker du at zoome ind? - prompt_microblog: Post til $1 ($2 venstre) - prompt_revertversion: "Ret tilbage til tidligere lagret version:" - prompt_savechanges: Gem ændringer - prompt_taggedpoints: Nogle af punktene på denne vej har tags eller er i en relation. Vil du virkelig slette? - prompt_track: Overfør dine GPS-spor til (låste) veje for redigering. - prompt_unlock: Klik for at låse op - prompt_welcome: Velkommen til OpenStreetMap! - retry: Prøv igen - revert: Fortryd - save: Gem - tags_backtolist: Tilbage til listen - tags_descriptions: Beskrivelser af '$ 1' - tags_findatag: Find et tag - tags_findtag: Find tag - tags_matching: Populære tags matchende '$1' - tags_typesearchterm: "Skriv et ord til at lede efter:" - tip_addrelation: Føj til en relation - tip_addtag: Tilføj et tag - tip_alert: Der opstod en fejl, klik for detaljer - tip_anticlockwise: Cirkulær vej mod uret, klik for at vende - tip_clockwise: Cirkulær vej med uret, klik for at vende - tip_direction: Vejretning, klik for at vende - tip_gps: Vis GPS spor (G) - tip_noundo: Intet at fortryde - tip_options: Sæt indstillinger (vælg kortbaggrund) - tip_photo: Åben fotos - tip_presettype: Vælg hvilke type forhåndsinstillinger som er tilgænglige i menuen - tip_repeattag: Gentag tags fra senest valgte vej (R) - tip_revertversion: Vælg versionen der skal rettes tilbage til - tip_selectrelation: Føj til den valgte rute - tip_splitway: Del vej i valgt punkt (X) - tip_tidy: Nydeliggøre vejpunkter (T) - tip_undo: Fortryd $1 (Z) - uploading: Overfører ... - uploading_deleting_pois: Sletning af POI'er - uploading_deleting_ways: Sletter veje - uploading_poi: Uploading POI $1 - uploading_poi_name: Uploader POI $1, $2 - uploading_relation: Uploader relation $1 - uploading_relation_name: Uploading relation $1, $2 - uploading_way: Uploader vej $1 - uploading_way_name: Uploading vej$ 1, $ 2 - warning: Advarsel! - way: Vej - "yes": Ja diff --git a/config/potlatch/locales/de.yml b/config/potlatch/locales/de.yml deleted file mode 100644 index 16810137a..000000000 --- a/config/potlatch/locales/de.yml +++ /dev/null @@ -1,251 +0,0 @@ -# Messages for German (Deutsch) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Apmon -# Author: Campmaster -# Author: CygnusOlor -# Author: Fnolz -# Author: Grille chompa -# Author: Kghbln -# Author: LWChris -# Author: Markobr -# Author: Michi -# Author: Pill -# Author: Raymond -# Author: The Evil IP address -# Author: Umherirrender -de: - a_poi: $1 einen Ort von Interesse (POI) - a_way: $1 einen Weg - action_addpoint: Punkt am Ende des Wegs hinzufügen - action_cancelchanges: Änderungen an $1 abgebrochen - action_changeway: in Weg ändern - action_createparallel: Erzeuge parallele Wege - action_createpoi: Einen Ort von Interesse (POI) erstellen - action_deletepoint: Punkt löschen - action_insertnode: Punkt auf Weg hinzufügen - action_mergeways: Zwei Wege zusammenlegen - action_movepoi: Ort von Interesse (POI) verschieben - action_movepoint: Punkt verschieben - action_moveway: einen Weg verschieben - action_pointtags: Attribute (Tags) für Punkt zuweisen - action_poitags: Attribute (Tags) für Ort von Interesse (POI) zuweisen - action_reverseway: Wegrichtung umkehren - action_revertway: Einen Weg umkehren - action_splitway: Weg teilen - action_waytags: Attribute (Tags) für Weg zuweisen - advanced: Erweitert - advanced_close: Changeset schließen - advanced_history: Weg Chronik - advanced_inspector: Inspektor - advanced_maximise: Fenster maximieren - advanced_minimise: Fenster minimieren - advanced_parallel: Paralleler Weg - advanced_tooltip: Erweiterte Editierfunktionen - advanced_undelete: Wiederherstellen - advice_bendy: Zu kurvig zum Begradigen (SHIFT zum Erzwingen) - advice_conflict: Konflikt - Du musst evtl. versuchen, erneut zu speichern - advice_deletingpoi: POI entfernen (Z zum Rückgängig machen) - advice_deletingway: Weg löschen (Z um es rückgängig zu machen) - advice_microblogged: $1 Status wurde aktualisiert - advice_nocommonpoint: Die Wege (Ways) haben keinen gemeinsamen Punkt. - advice_revertingpoi: Auf letzten gespeicherten POI zurücksetzen (Z zum Rückgängig-Machen) - advice_revertingway: Weg wurde zur letztgespeicherten Version wieder hergestellt. (Z für Rückgängig) - advice_tagconflict: Die Attribute (Tags) passen nicht zusammen (Z zum Rückgängig-Machen) - advice_toolong: Zu lang zum Entsperren - Bitte in kürzere Wege aufteilen. - advice_uploadempty: Es gibt nichts hochzuladen - advice_uploadfail: Hochladen angehalten - advice_uploadsuccess: Alle Daten wurden erfolgreich hochgeladen - advice_waydragged: Weg verschoben (Z zum Rückgängig-Machen) - cancel: Abbrechen - closechangeset: Changeset schließen - conflict_download: Deren Version herunterladen - conflict_overwrite: Deren Version überschreiben - conflict_poichanged: Seit dem Beginn deiner Änderungen hat jemand anderes den Punkt $1$2 verändert - conflict_relchanged: Seit dem Beginn deiner Änderungen hat ein anderer Nutzer die Relation $1$2 verändert - conflict_visitpoi: Klicke „Ok“ um den Punkt anzuzeigen - conflict_visitway: Klicke „OK“, um den Weg anzuzeigen. - conflict_waychanged: Seit dem Beginn deiner Änderungen hat jemand anderes den Weg $1$2 verändert - createrelation: Eine neue Relation erstellen - custom: "Eigener:" - delete: Löschen - deleting: löschen - drag_pois: POI klicken und ziehen - editinglive: Live bearbeiten - editingoffline: Offline bearbeiten - emailauthor: \n\nBitte maile an richard@systemeD.net eine Fehlerbeschreibung und schildere, was du in dem Moment getan hast. (Wenn möglich auf Englisch) - error_anonymous: Du kannst einen anonymen Mapper nicht kontaktieren. - error_connectionfailed: Die Verbindung zum OpenStreetMap-Server ist leider fehlgeschlagen. Kürzlich getätigte Änderungen wurden nicht gespeichert.\n\nErneut versuchen? - error_microblog_long: "Eintrag in $1 fehlgeschlagen:\nHTTP-Code: $2\nFehlertext: $3\n$1 Fehler: $4" - error_nopoi: Der Ort von Interesse (POI) kann nicht gefunden werden (vielleicht wurde der Kartenausschnitt verschoben?), daher ist Rückgängigmachen nicht möglich. - error_nosharedpoint: Die Wege $1 und $2 haben keinen gemeinsamen Punkt mehr, daher kann das Aufteilen nicht rückgängig gemacht werden. - error_noway: Der Weg $1 kann nicht gefunden werden (eventuell wurde der Kartenausschnitt verschoben), daher ist Rückgängigmachen nicht möglich. - error_readfailed: Der OpenStreetMap Server reagiert zurzeit nicht auf Anfragen von Daten.\n\nMöchtest du es noch einmal versuchen? - existingrelation: Zu einer bestehenden Relation hinzufügen - findrelation: Relation finden, die dies enthält - gpxpleasewait: Bitte warten, während die GPX-Aufzeichnung (Track) verarbeitet wird. - heading_drawing: Zeichnen - heading_introduction: Einführung - heading_pois: Los geht's - heading_quickref: Kurzübersicht - heading_surveying: Vermessung - heading_tagging: Tagging - heading_troubleshooting: Fehlerbehandlung - help: Hilfe - help_html: "Willkommen zu Potlatch\nPotlatch is der einfach zu bedienende Editor für OpenStreetMap. Zeichne Straßen, Wege, Landmarken und Geschäfte von deinen GPS Aufzeichnungen, Satellitenfotos oder alten Karten.\n\nDiese Hilfeseiten werden dich durch die Basisfunktionen von Potlatch führen und dir zeigen wo du mehr erfahren kannst. Klicke auf die Überschriften oben um zu beginnen.\n\nWenn du fertig bist klicke einfach irgendwo anders auf der Seite.\n\n\n\nHilfreiche Dinge die man wissen sollte\nKopiere nicht von anderen Karten!\n\nWenn du 'Live bearbeiten' wählst werden sämtliche Änderungen in die Datenbank gespeichert während du zeichnest - also sofort. Wenn du nicht so selbstsicher bist, wähle 'Bearbeiten und speichern' und sie werden nur dann übernommen wenn du auf 'Speichern' klickst.\n\nAlle Bearbeitungen werden normalerweise ein bis zwei Stunden nach dem Speichern auf der Karte sichtbar (ein paar Dinge brauchen eine Woche). Es gibt auch Dinge, welche nicht auf der Karte gezeigt werden - sie würde einfach zu unübersichtlich. Aber da die OpenStreetMap-Daten open source sind ist jeder dazu eingeladen Karten zu erstellen, welche andere Aspekte zeigen - wie zB OpenCycleMap oder Midnight Commander.\n\nMerke dir, dass es einerseits eine schöne Karte (also zeichne hübsche Kurven) und ein Diagramm (also vergewissere dich, dass deine Straßen an Kreuzungen verbunden sind).\n\nHaben wir schon erwähnt nicht von anderen Karten zu kopieren?\n\n\nFinde mehr heraus\nPotlatch Anleitung\nE-Mail-Verteiler\nOnline chat (Live Hilfe)\nWeb Forum\nCommunity Wiki\nPotlatch Sourcecode\n\n\n\nErste Schritte\nNachdem du nun Potlatch offen hast, klicke auf 'Bearbeiten mit speichern' um zu beginnen.\n\nDu bist nun bereit auf der Karte zu zeichnen. Am besten beginnst du damit ein paar 'Punkte von Interesse' auf die Karte zu ziehen (POIs - Points of Interest). Das können Pubs, Kirchen, Bahnhöfe oder alles was du magst sein.\n\nKlicken und ziehen\nUm es super einfach zu machen, gibt es eine Auswahl der meistgenutzten POIs direkt am unteren Ende der Karte für dich. Einen davon auf die Karte zu setzen geht ganz einfach - Anklicken und mit gedrückter Maustaste auf die richtige Stelle auf die Karte ziehen. Mach dir keine zu großen Gedanken darüber wenn du die Position nicht sofort richtig erwischst: du kannst es auf der Karte mittels Klicken und Ziehen nochmal verschieben bis die Position passt. Beobachte auch, dass der POI gelb hervorgehoben wird um zu zeigen, dass er selektiert wurde.\n\nSobald du das gemacht hast möchtest du natürlich deinem Pub (oder Kirche oder Bahnhof) einen Namen geben. Du wirst bemerken, dass eine kleine Tabelle am unteren Rand erschienen ist. Einer der Einträge wird 'name' sein gefolgt von '(type name here'). Mach das - klicke auf diesen Text und tippe den Namen ein.\n\nKlicke an eine andere Stelle in der Karte um die Selektion des POIs aufzuheben und die färbige Symbolleiste kommt zurück.\n\nEinfach, oder etwa nicht? Klicke auf 'Speichern' (unten rechts) wenn du fertig bist.\nHerumbewegen\nUm zu einem anderen Kartenausschnitt zu wechseln, ziehe einfach einen leeren Bereich der Karte. Potlatch wird automatisch neue Daten nachladen (Tip: Rechts oben steht Laden in diesem Fall).\n\nWir haben dir 'Bearbeiten mit speichern' vorgeschrieben, aber du kannst auch 'Live bearbeiten' wählen. In diesem Fall gehen alle Änderungen direkt in die Datenbank. Daher gibt es auch keinen 'Speichern'-Schalter. Das ist hilfreich für schnelle Änderungen und Mapping Parties.\n\nNächste Schritte\nGlücklich mit alle dem? Großartig. Klicke auf 'Vermessung' oben um herauszufinden wie du ein wirklicher Mapper wirst!\n\nVermessung via GPS\nDie Idee hinter OpenStreetMap ist es eine Karte ohne die einschränkenden Copyrights anderer Karten zu erstellen. Das bedeutet, dass es nicht erlaubt ist von anderen Karten abzuzeichnen: Du musst selber in die Straßen gehen und vermessen. Glücklicherweise macht das eine Menge Spaß.\nDer beste Weg dies zu machen ist mit einem GPS-Gerät. Suche einen Bereich der noch nicht erfasst ist und marschiere oder fahre die Straßen mit eingeschaltetem GPS entlang. Notiere dir die Straßennamen und alles andere von Interesse (Pubs? Kirchen?) wenn du daran vorbeikommst.\n\nWenn du nach Hause kommst hast du eine GPS-Aufzeichnung ('Tracklog') mit dem zurückgelegten Weg. Dieses kannst du zu OpenStreetMap aufladen.\n\nDas beste GPS-Gerät ist eines, dass Wegpunkte in hoher Frequenz erfasst (alle 1-2 Sekunden) und einen großen Speicher hat. Ein großer Anteil unserer Mapper benutzt Garmin-Geräte oder kleine Bluetooth-Einheiten. Im Wiki gibt es hierzu detailierte GPS Reviews.\n\nDeine Strecke Hochladen\nZuerst musst du deine Strecke vom GPS runterbekommen. Möglicherweise hat dein Gerät bereits Software hierfür mitgeliefert oder es lässt dich die Dateien mittels USB runterkopieren. Wenn nicht, versuche es mit GPSBabel. Egal auf welche Weise - Die Datei muss im Endeffekt im GPX-Format vorliegen.\n\nNun verwende das 'GPS-Tracks' Tab um deinen Track zu OpenStreetMap hochzuladen. Das ist aber erst der erste Schritt - er wird noch nicht auf der Karte erscheinen. Du musst die Straßen erst selber zeichnen und benennen auf Basis des Tracks.\nDen Track verwenden\nFinde den hochgeladenen Track in der 'GPS-Tracks' Liste und klicke auf 'bearbeiten' direkt daneben. Potlatch wird gestartet und der Track geladen inklusive aller Wegpunkte. Du bist jetzt bereit zum Zeichnen!\n\nDu kannst mit diesem Button auch GPS-Tracks anderer Mapper (allerdings ohne Wegpunkte) im aktuellen Bereich ansehen. Halte Shift um nur deine eigenen Tracks anzusehen.\nSattelitenfotos verwenden\nWenn du kein GPS besitzt nicht verdrübt sein. In einigen Städten haben wir Satellitenfotos zum Nachzeichnen welche freundlicherweise von Yahoo! bereitgestellt wurden (Danke!). Gehe raus und notiere dir die Straßennamen und wenn du zurückkommst zeichne die Linien.\n\nWenn du keine Satellitenfotos siehst, klicke den Optionen-Button und vergewissere dich, dass 'Yahoo!' ausgewählt ist. Wenn du immer noch keine siehst gibt es vermutlich keine Fotos deiner Stadt oder du musst eventuell etwas herauszoomen.\n\nBei den selben Optionen findest du auch ein paar Alternativoptionen wie zB eine Copyrightfreie Karte von UK oder die OpenTopoMap für das US-Gebiet. Diese sind alle speziell ausgewählt da es uns erlaubt wurde diese zu verwenden - kopiere nicht von anderen Karten oder Luftbildern (Copyright-Gesetze sind unser Feind).\n\nManchmal sind die Satellitenfotos nicht 100% auf der Position der tatsächlichen Straßen. Wenn du dies bemerkst halte die Leertaste und ziehe den Hintergrund bis er zusammenpasst. GPS-Tracks haben hierbei höhere Vertrauensrate als Satellitenfotos.\n\nWege zeichnen\nUm eine Straße (oder Weg) zu zeichnen, der in einem leeren Bereich der Karte beginnt, klicke einfach auf den Startpunkt; dann bei jedem einzelnen Punkt der Straße. Wenn du fertig bist mach entweder einen Doppelklick oder drücke Enter - dann klicke woandershin um die Selektion der Straße aufzuheben.\n\nUm einen Weg von einem anderen Weg weg zu zeichnen, klicke auf diesen um in zu selektieren; seine Punkte werden rot hervorgehoben. Halte Shift und klicke auf einen dieser Punkte um einen neuen Weg zu starten (Wenn noch kein Punkt an der neuen Kreuzung exisiert verwende ebenfalls Shift-Klick um einen zu erstellen!).\n\nKlicke 'Speichern' (unten rechts) wenn du fertig bist. Speichere oft, falls der Server Probleme hat.\n\nErwarte nicht deine Änderungen sofort in der Hauptkarte zu sehen. Das dauert normalerweise 1-2 Stunden, manchmal sogar bis zu einer Woche.\nKreuzungen erstellen\nEs ist sehr wichtig, dass bei Straßen, die sich kreuzung einen gemeinsamen Punkt (oder 'Node') besitzen. Routenplaner benötigen dies um zu wissen wo man abbiegen kann.\n\nPotlatch erledigt dies solange du vorsichtig bist und immer exakt auf den Weg klickst, an den angeschlossen werden soll. Halte Ausschau nach hilfreichen Zeichen: Die Punkte werden blau hervorgehoben, der Mauszeiger verändert sich und wenn du fertig bist hat die Kreuzung einen schwarzen Extra-Rand.\nVerändern und Löschen\nDas funktioniert so wie du es erwarten würdest. Um einen Punkt zu löschen selektiere ihn und drücke 'Entfernen'. Um einen ganzen Weg zu löschen drücke Shift-Entfernen.\n\nUm etwas zu verschieben ziehe es einfach. (Wenn du einen ganzen Weg verschieben willst musst du klicken und ein bischen warten bevor du ihn ziehst - Das ist um sicherzustellen, dass es nicht unabsichtlich passiert).\nErweitertes Zeichnen\nWenn 2 Teilbereiche eines Weges unterschiedliche Namen haben musst du ihn aufsplitten. Klicke auf den Weg; dann klicke den Punkt wo gesplittet werden soll und klicke abschließend auf die Schere. (Du kannst Wege vereinen indem du sie nacheinander mit gedrückter 'Strg'-Taste selektierst (bzw. am Mac mit gedrückter Apfel-Taste). Verbinde aber keine Wege, welche unterschiedliche Namen oder Typen haben!).\n\nKreisverkehre sind sehr schwer richtig zu zeichnen. Aber keine Panik - Potlatch hilft dabei. Zeichne den Kreis grob vor und stelle sicher, dass das Ende am eigenen Beginn anschließt, dann drücke auf dieses Icon um den Kreis 'aufzuräumen' (Du kannst dies ebenfalls verwenden um Straßen zu begradigen).\nPunkte von Interesse\nDas erste was du gelernt hast war klicken und ziehen von Punkten von Interesse. Du kannst einen solchen auch erzeugen indem du auf die Karte doppelklickst: ein gründer Kreis erscheint. Aber wie legst du nun fest ob es ein Pub, eine Kirche oder was auch immer ist? Klicke auf 'Tagging' um es herauszufinden!\n\nWelcher Straßentyp ist es?\nNachdem du einen Weg gezeichnet hast solltest du festlegen was es ist. Ist es eine Primärstraße, ein Fußweg oder gar ein Fluss? Was ist sein Name? Gibt es spezielle Regeln (zB \"keine Fahrräder\")?\n\nIn OpenStreetMap wird dies durch 'tags' erfasst. Ein tag hat 2 Teile und du kannst soviele erstellen wie du willst. Du könntest zum Beispiel highway | trunk hinzufügen um zu sagen, dass es eine Primärstraße ist; highway | residental für eine Straße im Ortsgebiet; oder highway | footway für einen Fußweg. Wenn Fahrräder verboten sind könntest du noch bicycle | no hinzufügen. Dann noch name | Market Street um der Straße einen Namen zu geben.\n\nDie Tags werden in Potlatch um unteren Bildschirmrand angezeigt - klicke auf eine bestehende Straße und du siehst welche Tags sie hat. Klicke auf '+' (unten rechts) um einen neuen Tag hinzuzufügen. Das 'x' neben jedem Tag löscht diesen.\n\nDu kannst ganze Wege taggen; Punkte innerhalb von Wegen (Gatter, Ampel,...); oder Punkte von Interesse.\nVorgefertigte Tags\nDamit du einfacher vorankommst, hat Potlatch einige Vorlagen welche die meistverwendeten Tags beinhalten.\n\nSelektiere einen Weg dann klicke die Symbole durch bis du ein passendens findest. Nun wähle die passenste option vom Menü.\n\nDamit werden die passenden Tags erstellt. Einige könnten teilweise leer sein so dass du sie ausfüllen kannst (zB Name einer Straße).\nEinbahnen\nDu kannst den tag oneway | yes hinzufügen - aber wie legst du die Richtung fest? Es gibt einen Pfeil unten links der die Wegrichtung anzeigt vom Start zum Ende. Klicke auf ihn um den Weg umzukehren.\nEigene Tags verwenden\nDu bist natürlich nicht auf die Vorlagen beschränkt. Mittels '+' kannst du jeden beliebigen Tag verwenden.\n\nDu kannst unter OSMdoc nachschauen, welche Tags von anderen Personen verwendet werden, bzw. gibt es eine lange liste polulärer Tags in unserem Wiki unter Map Features. Das sind aber nur Vorschläge, keine Regeln. Es steht dir frei eigene Tags zu erfinden oder welche von anderen Benutzern zu 'borgen'.\n\nDa die OpenStreetMap-Daten verwendet werden um viele unterschiedliche Karten zu erstellen wird jede Karte ihre eigene Auswahl an Tags zeigen ('rendern').\nRelationen\nManchmal sind Tags nicht genug und es ist erforderlich zwei oder mehrere Wege zu einer 'Gruppe' zusammenzufassen. Eventuell ist das Abbiegen von einer Straße in eine andere nicht erlaubt oder 20 Wege zusammen ergeben einen markierten Fahrradweg. Du kannst dis mit einem erweiterten Feature genannt 'Relationen' erledigen. Mehr dazu im wiki.\n\nFehler rückgängig machen\nDas ist der Undo-Button (du kannst auch Z drücken) - damit wird deine letzte Änderungen rückgängig gemacht.\n\nDu kannst auch einen Weg zu einer früheren Version 'zurücksetzen'. Wähle ihn dann klicke auf die ID (die Nummer unten links) - oder drücke H ('history'). Du bekommst eine Liste aller Änderungen inklusive Datum und Uhrzeit. Wähle einen Eintrag zu dem du zurückgehen willst und klicke 'Rückgängig machen'.\n\nWenn du unabsichtlich einen Weg gelöscht und gespeichert hast drücke U ('undelete'). Alle gelöschten Wege werden angezeigt. Wähle den Weg den du willst; entsperre ihn indem du den roten Balken bei den Tags auswählst; speichere wie üblich.\n\nBist du der Ansicht jemand anderes hat einen Fehler gemacht? Sende ihm eine freundliche Nachricht. Verwende die Verlaufsoption (H) und selektiere seinen namen. Dann klicke auf 'Nachricht'.\n\nVerwende den Inspector (im 'Erweiterten' Menü) um hilfreiche Informationen über die aktuell selektierten Wege oder Punkte zu erhalten.\nFAQs\nWie sehe ich meine Wegpunkte?\nWegpunkte werden nur angezeigt, wenn du auf 'bearbeiten' neben dem Track-Namen in 'GPS-Tracks' klickst. Die Datei muss Wegpunkte und Wege beinhalten - der Server verweigert alles was nur Wegpunkte beinhaltet.\n\nWeitere FAQs für Potlatch und OpenStreetMap.\n\n\n\nSchneller arbeiten\nJe weiter du herausgezoomt bist umso mehr Daten muss Potlatch laden. Zoome hinein bevor du auf 'Editieren' klickst.\n\nDeaktiviere 'Stift- und Hand-Mauszeiger verwenden' (im Optionsfenster) für maximale Geschwindigkeit.\n\nWenn der Server langsam ist versuche es später nochmal. Schau ins Wiki für bekannte Probleme. An manchen Zeiten, wie zum Beispiel Sonntag Abend, sind die Server oft stärker belastet.\n\nFordere Potlatch auf sich deine bevorzugten Tagzusammenstellungen zu merken. Selektiere einen Weg oder Punkt mit den gewünschten Tags, dann drücke Strg, Shift und eine Nummer von 1 bis 9. Um diese Tags anzuwenden drücke einfach Shift und die gewünschte Nummer (Potlatch merkt sich diese Vorlagen dann auf deinem Computer womit sie 'ewig' verfügbar bleiben).\n\nKonvertiere deinen GPS-Track in einen Weg indem du ihn in 'GPS-Tracks' auswählst, 'bearbeiten' klickst und dann die Checkbox zum konvertieren der Wege auswählst. Er wird als gesperrter (roter) weg übernommen und damit nicht gespeichert. Du musst ihn zuerst über den roten Balken bei den Tags entsperren.\n\nKlicken\nZiehe die Karte um herumzufahren.\nDoppelklick für einen neuen POI.\nEinfachklick um einen neuen Weg zu beginnen.\nKlicken und ziehen eines Weges oder POIs um ihn zu verschieben.\nBeim Weg-Zeichnen\nDoppelklick oder Enter zum Abschließen.\nKlicke auf einen anderen Weg für eine Kreuzung.\nShift-Klicke das Ende eines anderen Weges um zu vereinen.\nWenn ein Weg selektiert ist\nKlicke auf einen Punkt um ihn zu selektieren\nShift-Klicke in den Weg um einen neuen Punkt einzufügen.\nShift-Klicke auf einen Punkt um einen neuen Weg von dort zu starten.\nStrg-Klicke einen anderen Weg um zu vereinen.\n\nTastaturkürzel\nB Hintergrund-Quellen-Tag hinzufügen\nC Schließe Changeset\nG Zeige GPS Tracks\nH Zeige Verlauf\nI Zeige Inspektor\nJ Verbinde Punkte zu einer Kreuzung\n(+Shift) Unjoin from other ways\nK Sperre/Entsperre aktuelle Selektion\nL Zeige aktuelle Koordinaten\nM Maximiere Editierfenster\nP Erzeuge parallelen Weg\nR Wiederhole Tags\nS Speichern (sofern nicht Live-Modus)\nT Kreis oder gerade Linie erzeugen\nU Undelete (Zeige gelöschte Wege)\nX Weg in 2 Wege aufspalten\nZ Undo\n- Enterne den Punkte nur von diesem Weg\n+ Füge neuen Tag hinzu\n/ Selektiere einen anderen Weg mit gemeinsamem Punkt\nEntfernen Punkt Löschen\n (+Shift) Lösche gesamten Weg\nEnter Wegzeichnen beenden\nLeertaste Hintergrund verschieben\nEsc Aktuelle Änderungen verwerfen; Vom Server neuladen\n0 Alle Tags entfernen\n1-9 Vorlagentags auswählen\n (+Shift) Benutzertags laden\n (+Shift+Strg) Benutzertrags speichern\n§ oder ` Taggruppen durchgehen\n\n" - hint_drawmode: Klicken, um Punkt hinzuzufügen\nDoppelklicken oder Eingabetaste zum Beenden der Linie - hint_latlon: "Breitengrad $1\nLängengrad $2" - hint_loading: Wege werden geladen - hint_overendpoint: Überlappung mit Endpunkt\nKlicken zum Anschließen\nShift+Klick zum Verschmelzen - hint_overpoint: Überlappung mit Punkt\nKlicken zum Anschließen - hint_pointselected: Punkt ausgewählt\n(Shift+Punkt anklicken, um\n eine neue Linie zu erstellen) - hint_saving: Daten speichern - hint_saving_loading: Daten laden/speichern - inspector: Inspektor - inspector_duplicate: Duplikat von - inspector_in_ways: In den Wegen - inspector_latlon: "Breitengrad $1\nLängengrad $2" - inspector_locked: Gesperrt - inspector_node_count: ($1 mal) - inspector_not_in_any_ways: In keinem Weg (POI) - inspector_unsaved: Ungespeichert - inspector_uploading: (hochladen) - inspector_way: $1 - inspector_way_connects_to: Mit $1 Wegen verbunden - inspector_way_connects_to_principal: Verbunden mit $1 $2 und $3 weiteren $4 - inspector_way_name: $1 ($2) - inspector_way_nodes: $1 Knoten - inspector_way_nodes_closed: $1 Knoten (geschlossen) - loading: Lade... - login_pwd: "Passwort:" - login_retry: Deine Anmeldung wurde nicht akzeptiert. Bitte versuch es noch einmal. - login_title: Anmeldung fehlgeschlagen - login_uid: "Benutzername:" - mail: Nachricht - microblog_name_identica: Identi.ca - microblog_name_twitter: Twitter - more: Mehr - newchangeset: "Bitte versuche es noch einmal: Potlatch wird einen neuen Changeset verwenden." - "no": Nein - nobackground: Kein Hintergrund - norelations: Keine Relationen in diesem Gebiet - offset_broadcanal: Breiter Leinpfad - offset_choose: Offset wählen (m) - offset_dual: Straße mit getrennten Fahrspuren (D2) - offset_motorway: Autobahn (D3) - offset_narrowcanal: Enger Leinpfad - ok: OK - openchangeset: Changeset öffnen - option_custompointers: Stift- und Hand-Mauszeiger benutzen - option_external: "Externer Aufruf:" - option_fadebackground: Halbtransparenter Hintergrund - option_layer_cycle_map: OSM - Radwanderkarte - option_layer_digitalglobe_haiti: "Haiti: DigitalGlobe" - option_layer_geoeye_gravitystorm_haiti: "Haiti: GeoEye Jan 13" - option_layer_geoeye_nypl_haiti: "Haiti: GeoEye Jan 13+" - option_layer_maplint: OSM - Maplint (Fehler) - option_layer_mapnik: OSM - Mapnik - option_layer_nearmap: "Australien: NearMap" - option_layer_ooc_25k: "UK (historisch): Karten 1:25k" - option_layer_ooc_7th: "UK (historisch): 7th" - option_layer_ooc_npe: "UK (historisch): NPE" - option_layer_ooc_scotland: "UK (historisch): Schottland" - option_layer_os_streetview: "UK: OS StreetView" - option_layer_osmarender: OSM - Osmarender - option_layer_streets_haiti: "Haiti: Straßennamen" - option_layer_surrey_air_survey: "UK: Surrey Air Survey" - option_layer_tip: Hintergrund auswählen - option_layer_yahoo: Yahoo! - option_limitways: Warnung wenn große Datenmenge geladen wird - option_microblog_id: "Microblog-Name:" - option_microblog_pwd: "Microblog-Passwort:" - option_noname: Hervorheben von Straßen ohne Namen - option_photo: "Foto-KML:" - option_thinareas: Dünne Linien für Flächen verwenden - option_thinlines: Dünne Linien in allen Auflösungen verwenden - option_tiger: Unveränderte TIGER-Daten hervorheben - option_warnings: Warnungen anzeigen - point: Punkt - preset_icon_airport: Flughafen - preset_icon_bar: Bar - preset_icon_bus_stop: Bushaltestelle - preset_icon_cafe: Café - preset_icon_cinema: Kino - preset_icon_convenience: Nachbarschaftsladen - preset_icon_disaster: Haiti-Gebäude - preset_icon_fast_food: Schnellimbiss - preset_icon_ferry_terminal: Fähre - preset_icon_fire_station: Feuerwehr - preset_icon_hospital: Krankenhaus - preset_icon_hotel: Hotel - preset_icon_museum: Museum - preset_icon_parking: Parken - preset_icon_pharmacy: Apotheke - preset_icon_place_of_worship: Andachtsort - preset_icon_police: Polizeiwache - preset_icon_post_box: Briefkasten - preset_icon_pub: Pub - preset_icon_recycling: Recycling - preset_icon_restaurant: Restaurant - preset_icon_school: Schule - preset_icon_station: Bahnhof - preset_icon_supermarket: Supermarkt - preset_icon_taxi: Taxistand - preset_icon_telephone: Telefon - preset_icon_theatre: Theater - preset_tip: Wähle aus einem Menü von vorgefertigten Tags zur Beschreibung von „$1“ - prompt_addtorelation: $1 zu einer Relation hinzufügen - prompt_changesetcomment: "Bitte gib eine Beschreibung der Änderungen ein:" - prompt_closechangeset: Changeset $1 schließen - prompt_createparallel: Einen parallelen Weg erzeugen - prompt_editlive: Live bearbeiten - prompt_editsave: Bearbeiten und speichern - prompt_helpavailable: Neuer Benutzer? Unten links gibt es Hilfe. - prompt_launch: Externe URL öffnen - prompt_live: Im Live-Modus werden alle Änderungen direkt in der OpenStreetMap-Datenbank gespeichert. Dies ist für Anfänger nicht empfohlen. Wirklich fortfahren? - prompt_manyways: Dieses Gebiet ist sehr groß und wird lange zum Laden brauchen. Soll hineingezoomt werden? - prompt_microblog: Eintragen in $1 ($2 verbleibend) - prompt_revertversion: "Frühere Version wiederherstellen:" - prompt_savechanges: Änderungen speichern - prompt_taggedpoints: Einige Punkte auf diesem Weg besitzen Attribute oder sind Bestandteil von Relationen. Wirklich löschen? - prompt_track: Deine GPS-Aufzeichnungen (Tracks) in (gesperrte) Wege zum Editieren wandeln. - prompt_unlock: Anklicken zum Entsperren - prompt_welcome: Willkommen bei OpenStreetMap! - retry: Erneut versuchen - revert: Rückgängig machen - save: Speichern - tags_backtolist: Zurück zur Auflistung - tags_descriptions: Beschreibungen von '$1' - tags_findatag: Einen Tag finden - tags_findtag: Tag ermitteln - tags_matching: Beliebte Tags zu „$1“ - tags_typesearchterm: "Suchbegriff eingeben:" - tip_addrelation: Zu einer Relation hinzufügen - tip_addtag: Attribut (Tag) hinzufügen - tip_alert: Ein Fehler ist aufgetreten - Klicken für Details - tip_anticlockwise: Geschlossener Weg gegen den Uhrzeigersinn - Klicken zum Wechseln der Richtung - tip_clockwise: Geschlossener Weg im Uhrzeigersinn - Klicken zum Ändern der Richtung - tip_direction: Richtung des Weges - Klicken zum Umkehren - tip_gps: GPS-Aufzeichnungen (Tracks) einblenden (g/G) - tip_noundo: Es gibt nichts rückgängig zu machen. - tip_options: Optionen ändern (Kartenhintergrund) - tip_photo: Fotos laden - tip_presettype: Art der Voreinstellungen wählen, die im Menü angeboten werden sollen - tip_repeattag: Attribute (Tags) vom vorher markierten Weg übernehmen (R) - tip_revertversion: Version zur Wiederherstellung wählen - tip_selectrelation: Zur markierten Route hinzufügen - tip_splitway: Weg am ausgewählten Punkt auftrennen (x) - tip_tidy: Punkte im Weg aufräumen (T) - tip_undo: $1 rückgängig machen (Z) - uploading: Hochladen … - uploading_deleting_pois: Lösche POIs - uploading_deleting_ways: Wege löschen - uploading_poi: POI $1 hochladen - uploading_poi_name: POI $1, $2 hochladen - uploading_relation: Lade Relation $1 hoch - uploading_relation_name: Hochladen von Relation $1, $2 - uploading_way: Weg $1 hochladen - uploading_way_name: Weg $1, $2 hochladen - warning: Warnung! - way: Weg - "yes": Ja diff --git a/config/potlatch/locales/dsb.yml b/config/potlatch/locales/dsb.yml deleted file mode 100644 index de4bac734..000000000 --- a/config/potlatch/locales/dsb.yml +++ /dev/null @@ -1,227 +0,0 @@ -# Messages for Lower Sorbian (Dolnoserbski) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Michawiki -dsb: - a_poi: Dypk zajma $1 - a_way: Puś $1 - action_addpoint: pśidawa se suk ku kóńcoju puśa - action_cancelchanges: pśeterguju se změny na - action_changeway: změny na puśu - action_createparallel: napóraju se paralelne puśe - action_createpoi: napórajo se dypk zajma - action_deletepoint: lašujo se dypk - action_insertnode: pśidawa se suk puśoju - action_mergeways: zjadnośujotej se dwa puśa - action_movepoi: pśesuwa se dypk zajma - action_movepoint: pśesuwa se dypk - action_moveway: pśesuwa se puś - action_pointtags: pśipokazuju se atributy dypkoju - action_poitags: pśipokazuju se atributy na dypku zajma - action_reverseway: pśewobrośujo se směr puśa - action_revertway: pśewobrośujo se puś - action_splitway: rozdźělujo se puś - action_waytags: pśipokazanje atributow za puś - advanced: Rozšyrjony - advanced_close: Sajźbu změnow zacyniś - advanced_history: Historija puśa - advanced_inspector: Inspektor - advanced_maximise: Wokno maksiměrowaś - advanced_minimise: Wokno miniměrowaś - advanced_parallel: Paralelny puś - advanced_tooltip: Rozšyrjone wobźěłowańske akcije - advanced_undelete: Wótnowiś - advice_bendy: Pśekśiwy za zrownanje (UMSCH za wunuźenje) - advice_conflict: Serwerowy konflikt - móžno, až musyš znowego wopytaś składowaś - advice_deletingpoi: Lašujo se dypk zajma (Z za anulěrowanje) - advice_deletingway: Lašujo se puś (Z za anulěrowanje) - advice_microblogged: Twój status $1 jo se zaktualizěrował - advice_nocommonpoint: Puśe njamaju zgromadny dypk - advice_revertingpoi: Wrośa se k slědnemu skłaźonemu dypkoju zajma (Z za anulěrowanje) - advice_revertingway: Wrośa se k slědnemu skłaźonemu puśoju (Z za anulěrowanje) - advice_tagconflict: Atributy se njegóźe gromadu - pšosym pśekontrolěruj (T za anulěrowanje) - advice_toolong: Pśedłuki, aby se blokěrowanje wótpórało - pšosym do kratšych puśow rozdźěliś - advice_uploadempty: Nic za nagraśe - advice_uploadfail: Nagraśe zastajone - advice_uploadsuccess: Wšykne daty wuspěšnje nagrate - advice_waydragged: Puś pśesunjony (Z za anulěrowanje) - cancel: Pśetergnuś - closechangeset: Zacynja se sajźba změnow - conflict_download: Wersiju ześěgnuś - conflict_overwrite: Wersiju pśepisaś - conflict_poichanged: Něchten drugi jo dypk $1$2 změnił, z togo casa ako sy zachopił wobźěłowaś. - conflict_relchanged: Něchten drugi jo relaciju $1$2 změnił, z togo casa ako sy zachopił wobźěłowaś. - conflict_visitpoi: Klikni na "W pórědku", aby dypk pokazał. - conflict_visitway: Klikni na "W pórědku", aby puś pokazał. - conflict_waychanged: Něchten drugi jo puś $1$2 změnił, z togo casa ako sy zachopił wobźěłowaś. - createrelation: Nowu relaciju napóraś - custom: "Swójski:" - delete: lašowaś - deleting: lašujo se - drag_pois: Dypki zajma pśepołožyś - editinglive: Wobźěłujo se live - editingoffline: Wobźěłujo se offline - emailauthor: \n\nPšosym pósćel richard\@systemeD.net e-mail z wopisanim zmólki a napisaj, což sy cynił w toś tom wokognuśu. - error_anonymous: Njamóžoš se z anonymnym kartěrowarjom do zwiska stajiś. - error_connectionfailed: Bóžko zwisk ze serwerom OpenStreetMap jo se njeraźił. Nowše změny njejsu se składli.\n\nCoš hyšći raz wopytaś? - error_microblog_long: "Słanje powěsći do $1 jo se njeraźiło:\nHTTP-kod: $2\nZmólkowa powěźeńka: $3\nZmólka $1: $4" - error_nopoi: Dypk zajma njedajo se namakaś (snaź sy kórtowu wurězk pśesunuł), togodla anulěrowanje njejo móžno. - error_nosharedpoint: Puśa $1 a $2 wěcej njamaju zgromadny dypk, togodla rozdźělenje njedajo se anulěrowaś. - error_noway: Puś $1 njedajo se namakaś (snaź sy kórtowy wurězk pśesunuł?), togodla anulěrowanje njejo móžno. - error_readfailed: Bóžko serwer OpenStreetMap njejo wótegronił, gaž sy wó daty prosył.\n\nCoš hyšći raz wopytaś? - existingrelation: Eksistěrujucej relaciji pśidaś - findrelation: Pytaj relaciju, kótaraž wopśimujo - gpxpleasewait: Pšosym cakaj, mjaztym až se GPX-cera pśeźěłujo. - heading_drawing: Kreslanka - heading_introduction: Zapokazanje - heading_pois: Prědne kšace - heading_quickref: Malsna referenca - heading_surveying: Wuměrjenje - heading_tagging: Pśipokazowanje atributow - heading_troubleshooting: Rozwězanje problemow - help: Pomoc - hint_drawmode: kliknuś, aby se dypk pśidał\ndwójcy kliknuś/zapódawańska tasta\naby se linija skóńcyła - hint_latlon: "šyrina $1\ndlinina $2" - hint_loading: zacytuju se daty - hint_overendpoint: nad kóńcnym dypkom ($1)\nklikni, aby pśizamknuł\nUmsch+kliknjenje, aby zjadnośił - hint_overpoint: nad dypkom ($1)\nklikni, aby jen pśizamknuł - hint_pointselected: dypk wubrany\n(Umsch+kliknjenje na dypk, aby se\nnowa linija zachopiła - hint_saving: składuju se daty - hint_saving_loading: zacytuju se/składuju se daty - inspector: Inspektor - inspector_duplicate: Duplikat wót - inspector_in_ways: Na puśach - inspector_latlon: "Šyrina $1\nDlinina $2" - inspector_locked: Zastajony - inspector_not_in_any_ways: Nic na puśach (dypk zajma) - inspector_unsaved: Njeskłaźony - inspector_uploading: (nagraśe) - inspector_way_connects_to: Zwězuje z $1 puśami - inspector_way_connects_to_principal: Zwězuje z $1 $2 a $3 dalšnymi $4 - inspector_way_nodes: $1 sukow - inspector_way_nodes_closed: $1 sukow (zacynjonych) - loading: Zacytujo se... - login_pwd: "Gronidło:" - login_retry: Twójo pśizjawjenje njejo se spóznało. Pšosym wopytaj hyšći raz. - login_title: Pśizjawjenje njejo móžno było - login_uid: "Wužywarske mě:" - mail: Post - more: Wěcej - newchangeset: "\nPšosym wopytaj hyšći raz: Potlatch zachopijo nowu sajźbu změnow." - "no": Ně - nobackground: Žedna slězyna - norelations: Žedne relacije w toś tom wurězku - offset_broadcanal: Wlaceńska sćažka šyrokego kanala - offset_choose: Wurownanje wubraś (m) - offset_dual: Awtodroga (D2) - offset_motorway: Awtodroga (D3) - offset_narrowcanal: Wlaceńska sćažka wuskego kanala - ok: W pórědku - openchangeset: Wócynja se sajźba změnow - option_custompointers: Pisakowe a rucne pokazowaki wužywaś - option_external: "Eksterny start:" - option_fadebackground: Slězynu póswětliś - option_layer_cycle_map: OSM - kórta za kólasowarjow - option_layer_maplint: OSM - Maplint (zmólki) - option_layer_nearmap: "Awstralska: NearMap" - option_layer_ooc_25k: "Wjelika Britaniska historiski: 1:25k" - option_layer_ooc_7th: "Wjelika Britaniska historiski: 7th" - option_layer_ooc_npe: "Wjelika Britaniska historiski: NPE" - option_layer_ooc_scotland: "Zjadnośone kralojstwo historiske: Šotiska" - option_layer_os_streetview: "Zjadnośone kralojstwo: OS StreetView" - option_layer_streets_haiti: "Haiti: drozne mjenja" - option_layer_surrey_air_survey: "Zjadnośene kralojstwo: Pówětšowy wobraz Surrey" - option_layer_tip: Slězynu wubraś - option_limitways: Warnowaś, gaž wjele datow se zacytujo - option_microblog_id: "Mě mikrobloga:" - option_microblog_pwd: "Mikroblogowe gronidło:" - option_noname: Drogi bźez mjenjow wuzwignuś - option_photo: "Photo KML:" - option_thinareas: Śańke linije za wurězki wužywaś - option_thinlines: Śańke liniji za wše měritka wužywaś - option_tiger: Njezměnjony TIGER wuzwignuś - option_warnings: Znosowate warnowanja pokazaś - point: Dypk - preset_icon_airport: Lětanišćo - preset_icon_bar: Bara - preset_icon_bus_stop: Busowe zastanišćo - preset_icon_cafe: Kafejownja - preset_icon_cinema: Kino - preset_icon_convenience: Minimark - preset_icon_disaster: Haiti twarjenje - preset_icon_fast_food: Pójědankarnja - preset_icon_ferry_terminal: Prama - preset_icon_fire_station: Wognjarnja - preset_icon_hospital: Chórownja - preset_icon_hotel: Hotel - preset_icon_museum: Muzeum - preset_icon_parking: Parkowanišćo - preset_icon_pharmacy: Aptejka - preset_icon_place_of_worship: Kultowe městno - preset_icon_police: Policajska stacija - preset_icon_post_box: Listowy kašćik - preset_icon_pub: Kjarcma - preset_icon_recycling: Wužywanje wótpadankow - preset_icon_restaurant: Gósćeńc - preset_icon_school: Šula - preset_icon_station: Dwórnišćo, zeleznicowa stacija - preset_icon_supermarket: Supermark - preset_icon_taxi: Taksijowe městno - preset_icon_telephone: Telefon - preset_icon_theatre: Źiwadło - preset_tip: Z menija nastajonych atributow wubraś, kótarež wopisuju $1 - prompt_addtorelation: $1 relaciji pśidaś - prompt_changesetcomment: "Zapódaj wopisanje swójich změnow:" - prompt_closechangeset: Sajźbu změnow $1 zacyniś - prompt_createparallel: Paralelny puś napóraś - prompt_editlive: Live wobźěłaś - prompt_editsave: Wobźěłaś a składowaś - prompt_helpavailable: Ty sy nowy wužywaŕ? Glědaj dołojce nalěwo za pomoc. - prompt_launch: Eksterny URL startowaś - prompt_live: W modusu live, kuždy zapisk, kótaryž změnjaš, buźo se ned w datowej bance OpenStreetMap składowaś - njepśiraźijo se za zachopjeńkarjow. Coš to cyniś? - prompt_manyways: Tós ten wobłuk wopśimujo wjelgin wjele drobnostkow a buźo dłujko traś, jen zacytaś. Coš lubjej pówětšyś? - prompt_microblog: Powěsć do 1 ($2 zbytne) - prompt_revertversion: "K pjerwjejšnej skłaźonej wersiji se wrośiś:" - prompt_savechanges: Změny składowaś - prompt_taggedpoints: Někotare dypki na toś tom puśu maju atributy abo su w relacijach. Coš jen napšawdu lašowaś? - prompt_track: GPS-ceru do puśow konwertěrowaś - prompt_unlock: Klikni, aby se wótwóriło - prompt_welcome: Witaj do OpenStreetMap! - retry: Znowego wopytaś - revert: Pśewobrośiś - save: Składowaś - tags_backtolist: Slědk k lisćinje - tags_descriptions: Wopisanja wót '$1' - tags_findatag: Atribut namakaś - tags_findtag: Atribut namakaś - tags_matching: Woblubowane atributy, kótarež '$1' wótpowěduju - tags_typesearchterm: "Zapódaj pytański wuraz:" - tip_addrelation: Relaciji pśidaś - tip_addtag: Nowy atribut pśidaś - tip_alert: Zmólka jo nastała - klikni za drobnostki - tip_anticlockwise: Kulowaty puś nawopaki ako špera źo - klikni, aby pśwobrośił - tip_clockwise: Kulowaty puś ako špěra źo - klikni, aby pśewobrośił - tip_direction: Směr puśa - klikni, aby jen pśewobrośił - tip_gps: GPS-cery pokazaś (G) - tip_noundo: Njejo nic za anulěrowanje. - tip_options: Opcije nastajiś (slězynu kórty wubraś) - tip_photo: Fota zacytaś - tip_presettype: Typ standardnych nastajenjow wubraś, kótarež se w meniju pórucuju. - tip_repeattag: Atributy z pjerwjej wubranego puśa pśewześ (R) - tip_revertversion: Datum za wótnowjenje wubraś - tip_selectrelation: Wubranej ruśe pśidaś - tip_splitway: Puś pśi wubranem dypkom rozdźěliś (X) - tip_tidy: Dypki puśa rědowaś (T) - tip_undo: $1 anulěrowaś (Z) - uploading: Nagrawa se... - uploading_deleting_pois: Dypki zajma lašowaś - uploading_deleting_ways: Puśe lašowaś - uploading_poi: Nagrawa se dypk zajma $1 - uploading_poi_name: Nagrawa se dypk zajma $1, $2 - uploading_relation: Nagrawa se relacija $1 - uploading_relation_name: Nagrawa se relacija $1, $2 - uploading_way: Nagrawa se puś $1 - uploading_way_name: Nagrawa se puś $1, $2 - warning: Warnowanje! - way: Puś - "yes": Jo diff --git a/config/potlatch/locales/en.yml b/config/potlatch/locales/en.yml deleted file mode 100644 index 207c5f9ac..000000000 --- a/config/potlatch/locales/en.yml +++ /dev/null @@ -1,238 +0,0 @@ -# Messages for English (English) -# Exported from translatewiki.net -# Export driver: syck -en: - a_poi: $1 a POI - a_way: $1 a way - action_addpoint: adding a node to the end of a way - action_cancelchanges: cancelling changes to - action_changeway: changes to a way - action_createparallel: creating parallel ways - action_createpoi: creating a POI - action_deletepoint: deleting a point - action_insertnode: adding a node into a way - action_mergeways: merging two ways - action_movepoi: moving a POI - action_movepoint: moving a point - action_moveway: moving a way - action_pointtags: setting tags on a point - action_poitags: setting tags on a POI - action_reverseway: reversing a way - action_revertway: reverting a way - action_splitway: splitting a way - action_waytags: setting tags on a way - advanced: Advanced - advanced_close: Close changeset - advanced_history: Way history - advanced_inspector: Inspector - advanced_maximise: Maximise window - advanced_minimise: Minimise window - advanced_parallel: Parallel way - advanced_tooltip: Advanced editing actions - advanced_undelete: Undelete - advice_bendy: Too bendy to straighten (SHIFT to force) - advice_conflict: Server conflict - you may need to try saving again - advice_deletingpoi: Deleting POI (Z to undo) - advice_deletingway: Deleting way (Z to undo) - advice_microblogged: Updated your $1 status - advice_nocommonpoint: The ways do not share a common point - advice_revertingpoi: Reverting to last saved POI (Z to undo) - advice_revertingway: Reverting to last saved way (Z to undo) - advice_tagconflict: Tags don't match - please check (Z to undo) - advice_toolong: Too long to unlock - please split into shorter ways - advice_uploadempty: Nothing to upload - advice_uploadfail: Upload stopped - advice_uploadsuccess: All data successfully uploaded - advice_waydragged: Way dragged (Z to undo) - cancel: Cancel - closechangeset: Closing changeset - conflict_download: Download their version - conflict_overwrite: Overwrite their version - conflict_poichanged: Since you started editing, someone else has changed point $1$2. - conflict_relchanged: Since you started editing, someone else has changed relation $1$2. - conflict_visitpoi: Click 'Ok' to show the point. - conflict_visitway: Click 'Ok' to show the way. - conflict_waychanged: Since you started editing, someone else has changed way $1$2. - createrelation: Create a new relation - custom: "Custom:" - delete: Delete - deleting: deleting - drag_pois: Drag and drop points of interest - editinglive: Editing live - editingoffline: Editing offline - emailauthor: \n\nPlease e-mail richard@systemeD.net with a bug report, saying what you were doing at the time. - error_anonymous: You cannot contact an anonymous mapper. - error_connectionfailed: Sorry - the connection to the OpenStreetMap server failed. Any recent changes have not been saved.\n\nWould you like to try again? - error_microblog_long: "Posting to $1 failed:\nHTTP code: $2\nError message: $3\n$1 error: $4" - error_nopoi: The POI cannot be found (perhaps you've panned away?) so I can't undo. - error_nosharedpoint: Ways $1 and $2 don't share a common point any more, so I can't undo the split. - error_noway: Way $1 cannot be found (perhaps you've panned away?) so I can't undo. - error_readfailed: Sorry - the OpenStreetMap server didn't respond when asked for data.\n\nWould you like to try again? - existingrelation: Add to an existing relation - findrelation: Find a relation containing - gpxpleasewait: Please wait while the GPX trace is processed. - heading_drawing: Drawing - heading_introduction: Introduction - heading_pois: Getting started - heading_quickref: Quick reference - heading_surveying: Surveying - heading_tagging: Tagging - heading_troubleshooting: Troubleshooting - help: Help - help_html: "Welcome to Potlatch\nPotlatch is the easy-to-use editor for OpenStreetMap. Draw roads, paths, landmarks and shops from your GPS surveys, satellite imagery or old maps.\n\nThese help pages will take you through the basics of using Potlatch, and tell you where to find out more. Click the headings above to begin.\n\nWhen you've finished, just click anywhere else on the page.\n\n\n\nUseful stuff to know\nDon't copy from other maps! \n\nIf you choose 'Edit live', any changes you make will go into the database as you draw them - like, immediately. If you're not so confident, choose 'Edit with save', and they'll only go in when you press 'Save'.\n\nAny edits you make will usually be shown on the map after an hour or two (a few things take a week). Not everything is shown on the map - it would look too messy. But because OpenStreetMap's data is open source, other people are free to make maps showing different aspects - like OpenCycleMap or Midnight Commander.\n\nRemember it's both a good-looking map (so draw pretty curves for bends) and a diagram (so make sure roads join at junctions).\n\nDid we mention about not copying from other maps?\n\n\nFind out more\nPotlatch manual\nMailing lists\nOnline chat (live help)\nWeb forum\nCommunity wiki\nPotlatch source-code\n\n\n\nGetting started\nNow that you have Potlatch open, click 'Edit with save' to get started.\n\t\nSo you're ready to draw a map. The easiest place to start is by putting some points of interest on the map - or \"POIs\". These might be pubs, churches, railway stations... anything you like.\n\nDrag and drop\nTo make it super-easy, you'll see a selection of the most common POIs, right at the bottom of the map for you. Putting one on the map is as easy as dragging it from there onto the right place on the map. And don't worry if you don't get the position right first time: you can drag it again until it's right. Note that the POI is highlighted in yellow to show that it's selected.\n\t\nOnce you've done that, you'll want to give your pub (or church, or station) a name. You'll see that a little table has appeared at the bottom. One of the entries will say \"name\" followed by \"(type name here)\". Do that - click that text, and type the name.\n\nClick somewhere else on the map to deselect your POI, and the colourful little panel returns.\n\nEasy, isn't it? Click 'Save' (bottom right) when you're done.\nMoving around\nTo move to a different part of the map, just drag an empty area. Potlatch will automatically load the new data (look at the top right).\n\nWe told you to 'Edit with save', but you can also click 'Edit live'. If you do this, your changes will go into the database straightaway, so there's no 'Save' button. This is good for quick changes and mapping parties.\n\nNext steps\nHappy with all of that? Great. Click 'Surveying' above to find out how to become a real mapper!\n\nSurveying with a GPS\nThe idea behind OpenStreetMap is to make a map without the restrictive copyright of other maps. This means you can't copy from elsewhere: you must go and survey the streets yourself. Fortunately, it's lots of fun!\n\t\nThe best way to do this is with a handheld GPS set. Find an area that isn't mapped yet, then walk or cycle up the streets with your GPS switched on. Note the street names, and anything else interesting (pubs? churches?) , as you go along.\n\nWhen you get home, your GPS will contain a 'tracklog' recording everywhere you've been. You can then upload this to OpenStreetMap.\n\nThe best type of GPS is one that records to the tracklog frequently (every second or two) and has a big memory. Lots of our mappers use handheld Garmins or little Bluetooth units. There are detailed GPS Reviews on our wiki.\nUploading your trace\nNow, you need to get your trace off the GPS set. Maybe your GPS came with some software, or maybe it lets you copy the files off via USB. If not, try GPSBabel. Whatever, you want the file to be in GPX format.\n\nThen use the 'GPS Traces' tab to upload your trace to OpenStreetMap. But this is only the first bit - it won't appear on the map yet. You must draw and name the roads yourself, using the trace as a guide.\nUsing your trace\nFind your uploaded trace in the 'GPS Traces' listing, and click 'edit' right next to it. Potlatch will start with this trace loaded, plus any waypoints. You're ready to draw!\n\nYou can also click this button to show everyone's GPS traces (but not waypoints) for the current area. Hold Shift to show just your traces.\nUsing satellite photos\nIf you don't have a GPS, don't worry. In some cities, we have satellite photos you can trace over, kindly supplied by Yahoo! (thanks!). Go out and note the street names, then come back and trace over the lines.\n\nIf you don't see the satellite imagery, click the options button and make sure 'Yahoo!' is selected. If you still don't see it, it's probably not available for your city, or you might need to zoom out a bit.\n\nOn this same options button you'll find a few other choices like an out-of-copyright map of the UK, and OpenTopoMap for the US. These are all specially selected because we're allowed to use them - don't copy from anyone else's maps or aerial photos. (Copyright law sucks.)\n\nSometimes satellite pics are a bit displaced from where the roads really are. If you find this, hold Space and drag the background until it lines up. Always trust GPS traces over satellite pics.\n\nDrawing ways\nTo draw a road (or 'way') starting at a blank space on the map, just click there; then at each point on the road in turn. When you've finished, double-click or press Enter - then click somewhere else to deselect the road.\n\nTo draw a way starting from another way, click that road to select it; its points will appear red. Hold Shift and click one of them to start a new way at that point. (If there's no red point at the junction, shift-click where you want one!)\n\nClick 'Save' (bottom right) when you're done. Save often, in case the server has problems.\n\nDon't expect your changes to show instantly on the main map. It usually takes an hour or two, sometimes up to a week.\nMaking junctions\nIt's really important that, where two roads join, they share a point (or 'node'). Route-planners use this to know where to turn.\n\t\nPotlatch takes care of this as long as you are careful to click exactly on the way you're joining. Look for the helpful signs: the points light up blue, the pointer changes, and when you're done, the junction point has a black outline.\nMoving and deleting\nThis works just as you'd expect it to. To delete a point, select it and press Delete. To delete a whole way, press Shift-Delete.\n\nTo move something, just drag it. (You'll have to click and hold for a short while before dragging a way, so you don't do it by accident.)\nMore advanced drawing\nIf two parts of a way have different names, you'll need to split them. Click the way; then click the point where it should be split, and click the scissors. (You can merge ways by clicking with Control, or the Apple key on a Mac, but don't merge two roads of different names or types.)\n\t\nRoundabouts are really hard to draw right. Don't worry - Potlatch can help. Just draw the loop roughly, making sure it joins back on itself at the end, then click this icon to 'tidy' it. (You can also use this to straighten out roads.)\nPoints of interest\nThe first thing you learned was how to drag-and-drop a point of interest. You can also create one by double-clicking on the map: a green circle appears. But how to say whether it's a pub, a church or what? Click 'Tagging' above to find out!\n\nWhat type of road is it?\nOnce you've drawn a way, you should say what it is. Is it a major road, a footpath or a river? What's its name? Are there any special rules (e.g. \"no bicycles\")?\n\nIn OpenStreetMap, you record this using 'tags'. A tag has two parts, and you can have as many as you like. For example, you could add highway | trunk to say it's a major road; highway | residential for a road on a housing estate; or highway | footway for a footpath. If bikes were banned, you could then add bicycle | no. Then to record its name, add name | Market Street.\n\nThe tags in Potlatch appear at the bottom of the screen - click an existing road, and you'll see what tags it has. Click the '+' sign (bottom right) to add a new tag. The 'x' by each tag deletes it.\n\nYou can tag whole ways; points in ways (maybe a gate or a traffic light); and points of interest.\nUsing preset tags\nTo get you started, Potlatch has ready-made presets containing the most popular tags.\n\nSelect a way, then click through the symbols until you find a suitable one. Then, choose the most appropriate option from the menu.\n\nThis will fill the tags in. Some will be left partly blank so you can type in (for example) the road name and number.\nOne-way roads\nYou might want to add a tag like oneway | yes - but how do you say which direction? There's an arrow in the bottom left that shows the way's direction, from start to end. Click it to reverse.\nChoosing your own tags\nOf course, you're not restricted to just the presets. By using the '+' button, you can use any tags at all.\n\nYou can see what tags other people use at OSMdoc, and there is a long list of popular tags on our wiki called Map Features. But these are only suggestions, not rules. You are free to invent your own tags or borrow from others.\n\nBecause OpenStreetMap data is used to make many different maps, each map will show (or 'render') its own choice of tags.\nRelations\nSometimes tags aren't enough, and you need to 'group' two or more ways. Maybe a turn is banned from one road into another, or 20 ways together make up a signed cycle route. You can do this with an advanced feature called 'relations'. Find out more on the wiki.\n\nUndoing mistakes\nThis is the undo button (you can also press Z) - it will undo the last thing you did.\n\nYou can 'revert' to a previously saved version of a way or point. Select it, then click its ID (the number at the bottom left) - or press H (for 'history'). You'll see a list of everyone who's edited it, and when. Choose the one to go back to, and click Revert.\n\nIf you've accidentally deleted a way and saved it, press U (for 'undelete'). All the deleted ways will be shown. Choose the one you want; unlock it by clicking the red padlock; and save as usual.\n\nThink someone else has made a mistake? Send them a friendly message. Use the history option (H) to select their name, then click 'Mail'.\n\nUse the Inspector (in the 'Advanced' menu) for helpful information about the current way or point.\nFAQs\nHow do I see my waypoints?\nWaypoints only show up if you click 'edit' by the trace name in 'GPS Traces'. The file has to have both waypoints and tracklog in it - the server rejects anything with waypoints alone.\n\nMore FAQs for Potlatch and OpenStreetMap.\n\n\n\nWorking faster\nThe further out you're zoomed, the more data Potlatch has to load. Zoom in before clicking 'Edit'.\n\nTurn off 'Use pen and hand pointers' (in the options window) for maximum speed.\n\nIf the server is running slowly, come back later. Check the wiki for known problems. Some times, like Sunday evenings, are always busy.\n\nTell Potlatch to memorise your favourite sets of tags. Select a way or point with those tags, then press Ctrl, Shift and a number from 1 to 9. Then, to apply those tags again, just press Shift and that number. (They'll be remembered every time you use Potlatch on this computer.)\n\nTurn your GPS trace into a way by finding it in the 'GPS Traces' list, clicking 'edit' by it, then tick the 'convert' box. It'll be locked (red) so won't save. Edit it first, then click the red padlock to unlock when ready to save.\n\nWhat to click\nDrag the map to move around.\nDouble-click to create a new POI.\nSingle-click to start a new way.\nHold and drag a way or POI to move it.\nWhen drawing a way\nDouble-click or press Enter to finish drawing.\nClick another way to make a junction.\nShift-click the end of another way to merge.\nWhen a way is selected\nClick a point to select it.\nShift-click in the way to insert a new point.\nShift-click a point to start a new way from there.\nControl-click another way to merge.\n\nKeyboard shortcuts\nB\tAdd background source tag\nC\tClose changeset\nG\tShow GPS traces\nH\tShow history\nI\tShow inspector\nJ\tJoin point to what's below ways\n (+Shift)\tUnjoin from other ways\nK\tLock/unlock current selection\nL\tShow current latitude/longitude\nM\tMaximise editing window\nP\tCreate parallel way\nR\tRepeat tags\nS\tSave (unless editing live)\nT\tTidy into straight line/circle\nU\tUndelete (show deleted ways)\nX\tCut way in two\nZ\tUndo\n-\tRemove point from this way only\n+\tAdd new tag\n/\tSelect another way sharing this point\nDelete\tDelete point\n (+Shift)\tDelete entire way\nReturn\tFinish drawing line\nSpace\tHold and drag background\nEsc\tAbort this edit; reload from server\n0\tRemove all tags\n1-9\tSelect preset tags\n (+Shift)\tSelect memorised tags\n (+S/Ctrl)\tMemorise tags\n§ or `\tCycle between tag groups\n" - hint_drawmode: click to add point\ndouble-click/Return\nto end line - hint_latlon: "lat $1\nlon $2" - hint_loading: loading data - hint_overendpoint: over endpoint ($1)\nclick to join\nshift-click to merge - hint_overpoint: over point ($1)\nclick to join - hint_pointselected: point selected\n(shift-click point to\nstart new line) - hint_saving: saving data - hint_saving_loading: loading/saving data - inspector: Inspector - inspector_duplicate: Duplicate of - inspector_in_ways: In ways - inspector_latlon: "Lat $1\nLon $2" - inspector_locked: Locked - inspector_node_count: ($1 times) - inspector_not_in_any_ways: Not in any ways (POI) - inspector_unsaved: Unsaved - inspector_uploading: (uploading) - inspector_way: $1 - inspector_way_connects_to: Connects to $1 ways - inspector_way_connects_to_principal: Connects to $1 $2 and $3 other $4 - inspector_way_name: $1 ($2) - inspector_way_nodes: $1 nodes - inspector_way_nodes_closed: $1 nodes (closed) - loading: Loading... - login_pwd: "Password:" - login_retry: Your site login was not recognised. Please try again. - login_title: Couldn't log in - login_uid: "Username:" - mail: Mail - microblog_name_identica: Identi.ca - microblog_name_twitter: Twitter - more: More - newchangeset: "\nPlease try again: Potlatch will start a new changeset." - "no": 'No' - nobackground: No background - norelations: No relations in current area - offset_broadcanal: Broad canal towpath - offset_choose: Choose offset (m) - offset_dual: Dual carriageway (D2) - offset_motorway: Motorway (D3) - offset_narrowcanal: Narrow canal towpath - ok: Ok - openchangeset: Opening changeset - option_custompointers: Use pen and hand pointers - option_external: "External launch:" - option_fadebackground: Fade background - option_layer_cycle_map: OSM - cycle map - option_layer_geoeye_gravitystorm_haiti: "Haiti: GeoEye Jan 13" - option_layer_geoeye_nypl_haiti: "Haiti: GeoEye Jan 13+" - option_layer_digitalglobe_haiti: "Haiti: DigitalGlobe" - option_layer_streets_haiti: "Haiti: street names" - option_layer_maplint: OSM - Maplint (errors) - option_layer_mapnik: OSM - Mapnik - option_layer_nearmap: "Australia: NearMap" - option_layer_ooc_25k: "UK historic: 1:25k" - option_layer_ooc_7th: "UK historic: 7th" - option_layer_ooc_npe: "UK historic: NPE" - option_layer_ooc_scotland: "UK historic: Scotland" - option_layer_os_streetview: "UK: OS StreetView" - option_layer_surrey_air_survey: "UK: Surrey Air Survey" - option_layer_osmarender: OSM - Osmarender - option_layer_tip: Choose the background to display - option_layer_yahoo: Yahoo! - option_limitways: Warn when loading lots of data - option_microblog_id: "Microblog name:" - option_microblog_pwd: "Microblog password:" - option_noname: Highlight unnamed roads - option_photo: "Photo KML:" - option_thinareas: Use thinner lines for areas - option_thinlines: Use thin lines at all scales - option_tiger: Highlight unchanged TIGER - option_warnings: Show floating warnings - point: Point - preset_icon_airport: Airport - preset_icon_bar: Bar - preset_icon_bus_stop: Bus stop - preset_icon_cafe: Cafe - preset_icon_cinema: Cinema - preset_icon_convenience: Convenience shop - preset_icon_disaster: Haiti building - preset_icon_fast_food: Fast food - preset_icon_ferry_terminal: Ferry - preset_icon_fire_station: Fire station - preset_icon_hospital: Hospital - preset_icon_hotel: Hotel - preset_icon_museum: Museum - preset_icon_parking: Parking - preset_icon_pharmacy: Pharmacy - preset_icon_place_of_worship: Place of worship - preset_icon_police: Police station - preset_icon_post_box: Postbox - preset_icon_pub: Pub - preset_icon_recycling: Recycling - preset_icon_restaurant: Restaurant - preset_icon_school: School - preset_icon_station: Rail station - preset_icon_supermarket: Supermarket - preset_icon_taxi: Taxi rank - preset_icon_telephone: Telephone - preset_icon_theatre: Theatre - preset_tip: Choose from a menu of preset tags describing the $1 - prompt_addtorelation: Add $1 to a relation - prompt_changesetcomment: "Enter a description of your changes:" - prompt_closechangeset: Close changeset $1 - prompt_createparallel: Create parallel way - prompt_editlive: Edit live - prompt_editsave: Edit with save - prompt_helpavailable: New user? Look in the bottom left for help. - prompt_launch: Launch external URL - prompt_live: In live mode, every item you change will be saved in the OpenStreetMap database instantly - it's not recommended for beginners. Are you sure? - prompt_manyways: This area is very detailed and will take a long time to load. Would you prefer to zoom in? - prompt_microblog: Post to $1 ($2 left) - prompt_revertversion: "Revert to an earlier saved version:" - prompt_savechanges: Save changes - prompt_taggedpoints: Some of the points on this way are tagged or in relations. Really delete? - prompt_track: Convert GPS trace to ways - prompt_unlock: Click to unlock - prompt_welcome: Welcome to OpenStreetMap! - retry: Retry - revert: Revert - save: Save - tags_findtag: Find tag - tags_findatag: Find a tag - tags_typesearchterm: "Type a word to look for:" - tags_matching: Popular tags matching '$1' - tags_descriptions: Descriptions of '$1' - tags_backtolist: Back to list - tip_addrelation: Add to a relation - tip_addtag: Add a new tag - tip_alert: An error occurred - click for details - tip_anticlockwise: Anti-clockwise circular way - click to reverse - tip_clockwise: Clockwise circular way - click to reverse - tip_direction: Direction of way - click to reverse - tip_gps: Show GPS traces (G) - tip_noundo: Nothing to undo - tip_options: Set options (choose the map background) - tip_photo: Load photos - tip_presettype: Choose what type of presets are offered in the menu. - tip_repeattag: Repeat tags from the previously selected way (R) - tip_revertversion: Choose the date to revert to - tip_selectrelation: Add to the chosen route - tip_splitway: Split way at selected point (X) - tip_tidy: Tidy points in way (T) - tip_undo: Undo $1 (Z) - uploading: Uploading... - uploading_deleting_pois: Deleting POIs - uploading_deleting_ways: Deleting ways - uploading_poi: Uploading POI $1 - uploading_poi_name: Uploading POI $1, $2 - uploading_relation: Uploading relation $1 - uploading_relation_name: Uploading relation $1, $2 - uploading_way: Uploading way $1 - uploading_way_name: Uploading way $1, $2 - warning: Warning! - way: Way - "yes": 'Yes' diff --git a/config/potlatch/locales/eo.yml b/config/potlatch/locales/eo.yml deleted file mode 100644 index f3b1c9884..000000000 --- a/config/potlatch/locales/eo.yml +++ /dev/null @@ -1,31 +0,0 @@ -# Messages for Esperanto (Esperanto) -# Exported from translatewiki.net -# Export driver: syck -# Author: Cfoucher -# Author: Yekrats -eo: - a_way: $1 vojon - action_movepoint: Movante punkton - advanced_close: Malfermi ŝanĝaron - advanced_undelete: Malforigi - createrelation: Krei novan rilaton - custom: "Memkreita:" - delete: Forigi - editinglive: Aktiva redakto - heading_tagging: Etikedo - hint_saving: konservante datenojn - login_pwd: Pasvorto - login_uid: "Salutnomo:" - option_photo: "Foto KML:" - preset_icon_cinema: Kinejo - preset_icon_station: Stacidomo - prompt_changesetcomment: "Enmetu priskribon de viaj ŝanĝoj:" - prompt_editsave: Redakti kun konservo - prompt_savechanges: Konservi ŝanĝojn - retry: Reprovi - save: Konservi - tip_alert: Eraro okazis - klaku atingi detalojn - tip_direction: Vojdirekto - klaku por inversigi - tip_photo: Ŝarĝi fotojn - tip_undo: Malfari $1 (Z) - way: Vojo diff --git a/config/potlatch/locales/es.yml b/config/potlatch/locales/es.yml deleted file mode 100644 index 61e4c96f9..000000000 --- a/config/potlatch/locales/es.yml +++ /dev/null @@ -1,237 +0,0 @@ -# Messages for Spanish (Español) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Crazymadlover -# Author: McDutchie -# Author: Mor -# Author: PerroVerd -# Author: Translationista -es: - a_poi: $1 un punto de interés (POI) - a_way: $1 una vía - action_addpoint: Añadir un punto al final de una vía - action_cancelchanges: Cancelar cambios - action_changeway: cambios en la vía - action_createparallel: crea vías paralelas - action_createpoi: Crear un punto de interés (POI) - action_deletepoint: Borra un punto - action_insertnode: Añadir un punto a una vía - action_mergeways: Combinar dos vías - action_movepoi: Mover un punto de interés (POI) - action_movepoint: Mover un punto - action_moveway: mueve una vía - action_pointtags: Parámetros (tags) en un punto - action_poitags: Parámetros (tags) en un punto de interés (POI) - action_reverseway: Invierte la dirección de la vía - action_revertway: revertir una vía - action_splitway: Divide una vía - action_waytags: Parámetros (tags) en una vía - advanced: Avanzado - advanced_close: Cerrar conjunto de cambios - advanced_history: Histórico de la vía - advanced_inspector: Inspector - advanced_maximise: Maximizar ventana - advanced_minimise: Minimizar ventana - advanced_parallel: Vía paralela - advanced_tooltip: Acciones de edición avanzadas - advanced_undelete: Restaurar - advice_bendy: Muy curvo para enderezarse (presione MAYÚS para forzar) - advice_conflict: Conflicto en el servidor - puede que tenga que guardar de nuevo - advice_deletingpoi: Borrando POI (Z para deshacer) - advice_deletingway: Borrando vía (Z para deshacer) - advice_microblogged: Se ha actualizado tu estado $1 - advice_nocommonpoint: Las vías no comparten un punto en común - advice_revertingpoi: Volver al último POI guardado (Z para deshacer) - advice_revertingway: Deshaciendo cambios para volver a la última versión guardada (Z para deshacer) - advice_tagconflict: Las etiquetas no coinciden - Por favor revíselas (Z para deshacer) - advice_toolong: Demasiado largo para desbloquear - Por favor divídalo en vías más cortas - advice_uploadempty: Nada que subir - advice_uploadfail: Subida detenida - advice_uploadsuccess: Todos los datos se han subido con éxito - advice_waydragged: Vía desplazada (Z para deshacer) - cancel: Cancelar - closechangeset: Cerrando conjunto de cambios - conflict_download: Descarga su versión - conflict_overwrite: Sobreescribe su versión - conflict_poichanged: Desde que comenzó a editar alguien ha cambiado el punto $1$2. - conflict_relchanged: Desde que comenzó a editar alguien ha cambiado la relación $1$2. - conflict_visitpoi: Pulse 'Ok' para mostrar el punto. - conflict_visitway: Pulse 'Aceptar' para mostrar la vía - conflict_waychanged: Desde que comenzó a editar alguien ha cambiado la vía $1$2. - createrelation: Crear una nueva relación - custom: "Personalizado:" - delete: Borrar - deleting: Borrar - drag_pois: Arrastrar y soltar puntos de interés - editinglive: Editando en vivo - editingoffline: Editando fuera de línea - emailauthor: \n\nPor favor envíe un mail a richard\@systemeD.net con un informe del error, describiendo lo que hacía en ese momento. - error_anonymous: No puede contactar a un mapeador anónimo - error_connectionfailed: "Disculpe - la conexión al servidor de OpenStreetMap ha fallado. Cualquier cambio reciente no se ha guardado.\n\n¿Desea intentarlo de nuevo?" - error_microblog_long: "El envío a $1 falló:\nCódigo HTTP: $2\nMensaje de error: $3\n$1 error: $4" - error_nopoi: El punto de interés (POI) no se puede encontrar (¿quizás usted se ha desplazado a otra zona?), por tanto no se puede deshacer. - error_nosharedpoint: Las vías $1 y $2 ya no tienen ningún punto en común, por tanto no se pueden dividir. - error_noway: La vía $1 no se puede encontrar (¿quizás usted se ha desplazado a otra zona?), por tanto no se puede deshacer. - error_readfailed: Lo sentimos mucho. El servidor de OpenStreetMap no ha respondido a la solicitud de información. \n\n¿Deseas intentarlo de nuevo? - existingrelation: Añadir a una relación existente - findrelation: Buscar una relación que contenga - gpxpleasewait: Por favor, espere mientras la traza GPX se procesa. - heading_drawing: Dibujando - heading_introduction: Introducción - heading_pois: Primeros pasos - heading_quickref: Referencia rápida - heading_surveying: Recogida de datos - heading_tagging: Etiquetando - heading_troubleshooting: Resolución de problemas - help: Ayuda - help_html: "Bienvenido a Potlatch\nPotlatch es el editor fácil de usar para OpenStreetMap. Dibuje carreteras, calles, propiedades o tiendas desde sus datos de GPS, imágenes de satélite o mapas antiguos.\n\nEstas páginas de ayuda le mostrarán lo básico para usar Potlatch y le dirán donde puede ampliar esta información. Pulse sobre los encabezados de arriba para comenzar.\n\nCuando haya terminado, pulse en cualquier otro lugar de la página.\n\n\n\nCosas útiles que debe conocer\n¡No copie de otros mapas!\n\nSi elige 'Edición en vivo', cualquier cambio que realice se reflejará en la base de datos según lo dibuje, inmediatamente. Si no se encuentra seguro, elija 'Edición y guardar' y así solamente se almacenarán cuando usted pulse en 'Guardar'\n\nCualquier edición que haga, usualmente, se mostrará en el mapa pasada una o dos horas, aunque unas pocas cosas pueden tardar una semana. No todo se muestra en el mapa - se vería como una montonera. Pero como los datos de OpenStreetMap son libres cada uno es libre de crear mapas que ofrecen diferentes aspectos - como, por ejemplo, OpenCycleMap o el tema Midnight Commander\n\nRecuerde que se trata de dos cosas, una buena apariencia (así que dibuje bonitas curvas si es necesario) y vectores (así que asegúrese de unir las vías en los cruces)\n\n¿Hemos mencionado ya, lo de no copiar de otros mapas?\n\n\nDescubra más\nManual de Potlatch\nListas de correo\nChat en línea (ayuda al momento, en inglés)\nForo web\nWiki de la comunidad\nCódigo fuente de Potlatch\n\n\n\nPrimeros pasos\nAhora que ya tiene Potlatch abierto, pulse sobre 'Edición con guardar' para comenzar\n\nAsí ya está preparado para dibujar en el mapa. La forma más sencilla es situando algunos puntos de interés en el mapa - o \"POIs\". Estos puntos pueden ser bares, iglesias, estaciones de tren... cualquier cosa que quiera.\n\nArrastrar y soltar\nPara hacer las cosas súper fáciles, puede ver una selección de los POIs más comunes, justo debajo de su mapa. Poner uno de ellos en el mapa es tan fácil como arrastrarlo desde allí y soltarlo sobre el sitio adecuado en el mapa. Y no se preocupe si no coloca el elemento en el sitio exacto a la primera: puede arrastrarlo y soltarlo hasta que quede perfecto. Note que el POI está resaltado en amarillo para indicar que está seleccionado.\n\nUna vez que haya hecho esto, querrá dar un nombre a su bar (o iglesia, o estación...). Podrá ver que una pequeña tabla ha aparecido en la parte inferior. Una de las entradas dirá \"nombre\" seguido por \"(introduzca el nombre aquí)\". Hágalo - pulse sobre el texto e introduzca el nombre.\n\nPulse en cualquier otro sitio del mapa para quitar la selección de su POI, y así el pequeño y colorido panel volverá.\n\nFácil, ¿no? Haga clic en \"Guardar\" (abajo a la derecha) cuando haya terminado.\nMoverse\nPara moverse a una parte diferente del mapa, sólo tiene que arrastrar en un área vacía. Potlatch cargará automáticamente los nuevos datos (ver arriba a la derecha).\n\nLe hemos dicho que utilice 'Edición con guardar', pero también puede usar 'Edición en vivo'. Si hace esto sus cambios irán a la base de datos directamente, así que no hay un botón de 'Guardar'. Esto es útil para cambios rápidos y mapping parties.\n\nSiguientes pasos\n¿Feliz con todo esto? Genial. Pulse arriba sobre \"Recogida de datos\" para descubrir como convertirse en un mapero de verdad\n\nRecogida de datos con un GPS\nLa idea detrás de OpenStreetMap es hacer un mapa sin las restricciones de copyright de otros mapas. Esto significa que usted no puede copiar de otros sitios: debe ir a las calles y localizarlas usted mismo. Afortunadamente, esto es muy divertido.\nLa mejor manera de hacerlo es con un GPS de bolsillo. Encuentre un área que aún no este mapeada, entonces circule, a pie o en bicicleta, por las calles con su GPS encendido. Apunte los nombres de las calles y cualquier otra cosa interesante (bares, iglesias...) a medida que avanza.\n\nCuando llegue a casa, su GPS contendrá un 'registro de tracklog' de todas las partes en las que ha estado. A continuación, puede subir esto a OpenStreetMap.\n\nEl mejor tipo de GPS es uno en el que los registros se guarden con frecuencia (cada uno o dos segundos) y que tenga una memoria grande. Muchos de nuestros maperos utilizan dispositivos de mano Garmin o pequeñas unidades Bluetooth. Hay críticas de GPS detalladas en nuestro wiki.\n\nSube tu traza\nAhora, usted necesita extraer la traza del GPS. Tal vez su GPS trajese algun programa para esto, o quizá le permita copiar los archivos a través del USB. Si esto no funciona pruebe GPSBabel. En cualquier caso, necesita que el archivo esté en el formato GPX.\n\nA continuación, utilice la pestaña \"Trazas GPS\" para subir sus trazas a OpenStreetMap. Pero esto es sólo el primer paso - no aparecerá en el mapa todavía. Aún tiene que dibujar y nombrar las carreteras, usando la traza como una guía.\nEmplee su traza\nBusque su traza subida en el listado de 'Trazas GPS' y pulse en 'editar', junto a ella. Potlatch se iniciará con esa traza cargada, además de los puntos de interés. ¡Ahora ya está listo para dibujar!\n\nTambién puede pulsar en este botón para mostrar las trazas GPS de todo el mundo (pero no los puntos de vía) en la zona actual. Pulse la tecla Shift para mostrar sólo sus trazas.\nUso de fotos de satélite\nSi no tiene un GPS, no se preocupe. En algunas ciudades, tenemos fotos de satélite sobre las que podemos trazar, amablemente facilitadas por Yahoo! (¡gracias!). Salga fuera y tome nota del nombre de las calles, luego regrese y complete los datos.\n\nSi no ve las imágenes de satélite, pulse en el botón de opciones y asegurese que 'Yahoo!' está seleccionado. Si todavía no puede verlas es probable que no estén disponibles para su región o que necesita ampliar el zoom un poco.\n\nEn este mis botón de opciones encontrarás otras pocas opciones como un mapa de RU sin copyright, y OpenTopoMap para los EEUU. Estos son todos especialmente seleccionados porque estamos autorizados a usarlo - No copiar ningún otro mapa o foto aérea. (Copyright law sucks.)\n\nAlgunas veces las fotos satelitales están ligeramente desplazadas de donde las carreteras realmente están. Si encuentras esto, presiona espacio y arrastra el fondo hasta que se alinee. Siempre confiar en pistas GPS por sobre las fotos satelitales.\n\nDibujando vías\nPara dibujar una carretera (o 'vía') comenzando en un espacio en blanco en el mapa, sólo haz click allí; luego en cada punto de la carretera a la vez. Cuando has terminado, haz doble click o presiona Enter - Luego haz click en cualquier parte para deseleccionar la carretera.\n\nPara dibujar una vía comenzando desde otra vía, haz click en ese camino para seleccionarlo; sus puntos aparecerán en rojo. Presiona Shift y haz click en uno de ellos para comenzar una nueva vía en ese punto. (Si no hay punto rojo en la unión, presiona shift y haz click donde desees uno!)\n\nHaz click en 'Grabar' (botón derecho) cuando hayas terminado. Grabar regularmente, en caso el servidor tenga problemas.\n\nNo esperes que tus cambios sean mostrados instantáneamente en el mapa principal. usualmente toma una hora o dos, algunas veces hasta una semana.\nHacer cruces\nEs realmente importante que, cuando dos carreteras se junten, ellas compartan un punto (o 'nodo'). Planificadores de ruta usan esto para saber donde girar.\n\nPotlatch se encarga de esto, siempre y cuando tengas cuidado de hacer click exactamente en la vía que estás juntando. Busca las señales de ayuda: los puntos iluminados azul,el puntero cambia y cuando termines, el punto de unión tieneun contorno negro.\nMoviendo y borrando\nEsto funciona justo como lo esperabas. Para borrar un punto, selecciónalo y presiona Borrar. Para borrar una vía entera, presiona Shift-Borrar.\n\nPara mover algo, solo arrástralo. (tendrás que hacer click y mantener durante un corto tiempo antes de arrastrar una vía, por tanto no lo haces por accidente.)\nDibujo más avanzado\nSi dos partes de una vía tienen nombres diferentes, deberás dividirlas. Haz clic sobre la vía. Acto seguido, haz clic sobr el punto donde debe dividirse y después haz clic sobre las tijeras. (Puedes unir vías haciendo presionando Contrl o la manzana en el caso de teclado Mac, pero no unas dos vías con nombres o de tipos diferentes).\n\nLas rotondas o redomas son realmente difíciles de dibujar. No te preocupes. Potlach te puede ayudar. Simplemente dibuja una circunferencia sin cuidado pero asegurándote de cerrarla. Luego, haz clic en este icono para \"acomodarla\" (también puedes usar esta herraienta para enderezar carreteras).\nPuntos de interés\nThe first thing you learned was how to drag-and-drop a point of interest. You can also create one by double-clicking on the map: a green circle appears. But how to say whether it's a pub, a church or what? Click 'Tagging' above to find out!\n\nQue tipo de camino es este?\nUna vez que has dibujado una vía, deberías decir que es. Es una carretera principal, una vereda o un río? Cuál es su nombre? Hay algunas reglas especiales (e.g. \"no para bicicletas\")?\n\nIn OpenStreetMap, you record this using 'tags'. A tag has two parts, and you can have as many as you like. For example, you could add highway | trunk to say it's a major road; highway | residential for a road on a housing estate; or highway | footway for a footpath. If bikes were banned, you could then add bicycle | no. Then to record its name, add name | Market Street.\n\nThe tags in Potlatch appear at the bottom of the screen - click an existing road, and you'll see what tags it has. Click the '+' sign (bottom right) to add a new tag. The 'x' by each tag deletes it.\n\nPuedes etiquetar vías completas; puntos en vías (puede ser un puente o un semáforo); y puntos de interés.\nUso de etiquetas predefinidas\nTo get you started, Potlatch has ready-made presets containing the most popular tags.\n\nSeleccionar una vía, luego haz click através de los símbolos hasta encontrar uno adecuado. Luego, escoger la opción más apropiada del menú.\n\nThis will fill the tags in. Some will be left partly blank so you can type in (for example) the road name and number.\nVías de un sólo sentido\nYou might want to add a tag like oneway | yes - but how do you say which direction? There's an arrow in the bottom left that shows the way's direction, from start to end. Click it to reverse.\nElija sus propias etiquetas\nOf course, you're not restricted to just the presets. By using the '+' button, you can use any tags at all.\n\nYou can see what tags other people use at OSMdoc, and there is a long list of popular tags on our wiki called Map Features. But these are only suggestions, not rules. You are free to invent your own tags or borrow from others.\n\nBecause OpenStreetMap data is used to make many different maps, each map will show (or 'render') its own choice of tags.\nRelaciones\nSometimes tags aren't enough, and you need to 'group' two or more ways. Maybe a turn is banned from one road into another, or 20 ways together make up a signed cycle route. You can do this with an advanced feature called 'relations'. Find out more on the wiki.\n\nDeshacer errores\nEste es el botón deshacer (también puedes presionar Z) - revertirá tu última acción.\n\nYou can 'revert' to a previously saved version of a way or point. Select it, then click its ID (the number at the bottom left) - or press H (for 'history'). You'll see a list of everyone who's edited it, and when. Choose the one to go back to, and click Revert.\n\nIf you've accidentally deleted a way and saved it, press U (for 'undelete'). All the deleted ways will be shown. Choose the one you want; unlock it by clicking the red padlock; and save as usual.\n\nThink someone else has made a mistake? Send them a friendly message. Use the history option (H) to select their name, then click 'Mail'.\n\nUse the Inspector (in the 'Advanced' menu) for helpful information about the current way or point.\nPreguntas frecuentes\nHow do I see my waypoints?\nWaypoints only show up if you click 'edit' by the track name in 'GPS Traces'. The file has to have both waypoints and tracklog in it - the server rejects anything with waypoints alone.\n\nMás FAQs para Potlatch y OpenStreetMap.\n\n\n\nTrabajando más rápido\nThe further out you're zoomed, the more data Potlatch has to load. Zoom in before clicking 'Edit'.\n\nTurn off 'Use pen and hand pointers' (in the options window) for maximum speed.\n\nIf the server is running slowly, come back later. Check the wiki for known problems. Some times, like Sunday evenings, are always busy.\n\nTell Potlatch to memorise your favourite sets of tags. Select a way or point with those tags, then press Ctrl, Shift and a number from 1 to 9. Then, to apply those tags again, just press Shift and that number. (They'll be remembered every time you use Potlatch on this computer.)\n\nTurn your GPS track into a way by finding it in the 'GPS Traces' list, clicking 'edit' by it, then tick the 'convert' box. It'll be locked (red) so won't save. Edit it first, then click the red padlock to unlock when ready to save.\n\nQue hacer click\nArrastrar el mapa para moverlo.\nDouble-click to create a new POI.\nUn solo click para comenzar una nueva vía.\nHold and drag a way or POI to move it.\nCuando dibujes una vía\nHaz doble click o presiona Enter para terminar de dibujar.\nHaz click en otra vía para hacer un cruce.\nShift-click al final de otra vía para fusionar.\nCuando se selecciona una vía\nHaz click en un punto para seleccionarlo.\nShift-click en la vía para insertar un nuevo punto.\nShift-click un punto para comenzar una nueva vía desde allí.\nControl y click en otra vía para unir.\n\nAtajos de teclado\nB Add background source tag\nC Cerrar conjunto de cambios\nG Muestra trazas GPS\nH Muestra historial\nI Muestra inspector\nJ Unir el punto al cruce de vías\n(+Shift) Unjoin from other ways\nK Bloquea/desbloquea la selección actual\nL Muestra la latitud y longitud actual\nM Maximiza la ventana de edición\nP Crea una vía paralela\nR Repetir etiquetas\nS Guardar (a menos que estemos editando en vivo)\nT Tidy into straight line/circle\nU Undelete (show deleted ways)\nX Divide una vía en dos\nZ Deshacer\n- Elimina el punto sólo de esta vía\n+ Agrega nueva etiqueta\n/ Selecciona otra vía que comparta este nodo\nDelete Borra el punto\n (+Shift) Borra toda la vía\nReturn Termina de dibujar la línea\nSpace Hold and drag background\nEsc Cancelar esta edición; recargar desde el servidor\n0 Borrar todas las etiquetas\n1-9 Usa etiquetas preseleccionadas\n (+Shift) Selecciona etiquetas memorizadas\n (+S/Ctrl) Memoriza etiquetas\n§ o ` Rota entre los grupos de etiquetas\n\n" - hint_drawmode: Clic para añadir un punto\ndoble-clic/Return\npara terminar la línea - hint_latlon: "lat $1\nlon $2" - hint_loading: Cargando vías - hint_overendpoint: Sobre punto final\nclic para unir\nshift-clic para combinar - hint_overpoint: Sobre punto\nclick para unir" - hint_pointselected: Punto seleccionado\n(shift-clic en el punto para\nempezar nueva línea) - hint_saving: guardando los datos - hint_saving_loading: cargando/guardando datos - inspector: Inspector - inspector_duplicate: Duplicado de - inspector_in_ways: En vías - inspector_latlon: "Lat $1\nLon $2" - inspector_locked: Bloqueado - inspector_node_count: ($1 veces) - inspector_not_in_any_ways: No está en ninguna vía (POI) - inspector_unsaved: Sin guardar - inspector_uploading: (subiendo) - inspector_way: $1 - inspector_way_connects_to: Conecta con $1 vías - inspector_way_connects_to_principal: Conecta a $1 $2 y $3 otros $4 - inspector_way_name: $1 ($2) - inspector_way_nodes: $$1 nodos - inspector_way_nodes_closed: $1 nodos (cerrado) - loading: Cargando... - login_pwd: "Contraseña:" - login_retry: No se pudo reconocer tu acceso al sistema. Por favor, inténtalo de nuevo. - login_title: No se pudo acceder - login_uid: "Nombre de usuario:" - mail: Correo - microblog_name_twitter: Twitter - more: Más - newchangeset: "Por favor pruebe de nuevo: Potlatch comenzará un nuevo conjunto de cambios" - "no": 'No' - nobackground: Sin fondo - norelations: No hay relaciones en el área actual - offset_broadcanal: Camino de sirga amplio - offset_choose: Elija desplazamiento (m) - offset_dual: Carretera desdoblada (D2) - offset_motorway: Autopista (D3) - offset_narrowcanal: Camino de sirga angosto - ok: OK - openchangeset: Abriendo conjunto de cambios - option_custompointers: Usar punteros de pluma y mano - option_external: "Arranque externo:" - option_fadebackground: Atenuar fondo - option_layer_cycle_map: OSM - mapa ciclista - option_layer_maplint: OSM - Maplint (errores) - option_layer_nearmap: "Australia: NearMap" - option_layer_ooc_25k: "Histórico de UK: 1:25k" - option_layer_ooc_7th: "Histórico de UK: 7th" - option_layer_ooc_npe: "Histórico de UK: NPE" - option_layer_ooc_scotland: "UK histórico: Escocia" - option_layer_os_streetview: "UK: OS StreetView" - option_layer_streets_haiti: "Haiti: nombres de calles" - option_layer_surrey_air_survey: "UK: Surrey Air Survey" - option_layer_tip: Elija el fondo a mostrar - option_layer_yahoo: Yahoo! - option_limitways: Lanza una advertencia al cargar gran cantidad de datos. - option_microblog_id: "Nombre del microblog:" - option_microblog_pwd: "Contraseña del microblog:" - option_noname: Resalta las carreteras sin nombres - option_photo: "Foto KML:" - option_thinareas: Usar líneas más finas para áreas - option_thinlines: Usar líneas finas en todas las escalas - option_tiger: Resaltar TIGER sin cambiar - option_warnings: Mostrar alertas flotantes - point: Punto - preset_icon_airport: Aeropuerto - preset_icon_bar: Bar - preset_icon_bus_stop: Parada de autobús - preset_icon_cafe: Cafetería - preset_icon_cinema: Cine - preset_icon_convenience: Tienda de abarrotes, badulaque - preset_icon_disaster: Edificio en Haití - preset_icon_fast_food: Comida rápida - preset_icon_ferry_terminal: Transbordador - preset_icon_fire_station: Parque de bomberos - preset_icon_hospital: Hospital - preset_icon_hotel: Hotel - preset_icon_museum: Museo - preset_icon_parking: Aparcamiento - preset_icon_pharmacy: Farmacia - preset_icon_place_of_worship: Lugar de culto - preset_icon_police: Comisaria de policia - preset_icon_post_box: Buzón de correos - preset_icon_pub: Pub - preset_icon_recycling: Punto de reciclaje - preset_icon_restaurant: Restaurante - preset_icon_school: Escuela - preset_icon_station: Estación de tren - preset_icon_supermarket: Supermercado - preset_icon_taxi: Parada de taxi - preset_icon_telephone: Teléfono - preset_icon_theatre: Teatro - preset_tip: Elige de entre un menú de etiquetas preprogramadas que describan $1 - prompt_addtorelation: Añadir $1 a una relación - prompt_changesetcomment: "Introduzca una descripción de sus cambios:" - prompt_closechangeset: Cerrar conjunto de cambios $1 - prompt_createparallel: Crear vía paralela - prompt_editlive: Edición en vivo - prompt_editsave: Edición con guardar - prompt_helpavailable: ¿Usuario nuevo? Mire la ayuda en la zona inferior izquierda. - prompt_launch: Ir a URL externa - prompt_live: Al estar en vivo, cada cambio realizado se guardará instantáneamente en la base de datos de OpenStreetMap y esto no se recomienda a principiantes. ¿Estás seguro? - prompt_manyways: Esta área contiene muchos detalles y tardará mucho en cargarse. ¿Prefieres hacer un acercamiento? - prompt_microblog: Enviado a $1 ($2 restantes) - prompt_revertversion: "Volver a una versión previamente guardada:" - prompt_savechanges: Guardar cambios - prompt_taggedpoints: Alguno de los puntos de esta vía tienen etiquetas o están en una relación. ¿Realmente quiere borrarlos? - prompt_track: Convierta su traza de GPS a vías (bloqueadas) para editar. - prompt_unlock: Pulse para desbloquear - prompt_welcome: ¡Bienvenido a OpenStreetMap! - retry: Reintentar - revert: Revertir - save: Guardar - tags_backtolist: Volver a la lista - tags_descriptions: Descripciones de '$1' - tags_findatag: Busca una etiqueta - tags_findtag: Busca una etiqueta - tags_matching: Etiquetas populares que coinciden con '$1' - tags_typesearchterm: "Introduzca una palabra para buscar:" - tip_addrelation: Añadir a una relación - tip_addtag: Añadir un nuevo parámetro (tag) - tip_alert: Ha ocurrido un error - clic para detalles - tip_anticlockwise: Vía circular en el sentido contrario de las agujas del reloj - clic para invertir la dirección de la vía - tip_clockwise: Vía circular en el sentido de las agujas del reloj - pulse para invertir la dirección de la vía - tip_direction: Dirección de la vía - clic para invertir la dirección de la vía - tip_gps: Muestra las trazas de GPS (G) - tip_noundo: Nada que deshacer - tip_options: Opciones (elegir el fondo del mapa) - tip_photo: Cargar fotos - tip_presettype: Seleccionar que tipo de etiquetas preestablecidas se ofrecen en el menú. - tip_repeattag: Repetir las etiquetas de la vía seleccionada previamente (R) - tip_revertversion: Elija la fecha a la que volver. - tip_selectrelation: Añadir a la ruta seleccionada - tip_splitway: Divide la vía en el punto seleccionado (X) - tip_tidy: Simplificar puntos en una vía (T) - tip_undo: Deshacer $1 (Z) - uploading: Subiendo... - uploading_deleting_pois: Borrando POIs - uploading_deleting_ways: Borrando vías - uploading_poi: Subiendo POI $1 - uploading_poi_name: Subiendo POI $1, $2 - uploading_relation: Subiendo relación $1 - uploading_relation_name: Subiendo relación $1, $2 - uploading_way: Subiendo vía $1 - uploading_way_name: Subiendo vía $1, $2 - warning: ¡Aviso! - way: Vía - "yes": Sí diff --git a/config/potlatch/locales/eu.yml b/config/potlatch/locales/eu.yml deleted file mode 100644 index 60bf68ba1..000000000 --- a/config/potlatch/locales/eu.yml +++ /dev/null @@ -1,129 +0,0 @@ -# Messages for Basque (Euskara) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: An13sa -# Author: MikelEH -# Author: PerroVerd -# Author: Theklan -eu: - a_poi: $1 POI bat - a_way: Bide bat $1 - action_deletepoint: puntu bat ezabatzen - action_insertnode: noko bat gehitzen bideari - action_mergeways: bi bide elkartzen - action_pointtags: jarri etiketak puntu bati - action_poitags: POI batean etiketak zehazten - advanced: Aurreratua - advanced_close: Itxi aldaketa multzoa - advanced_history: Bidearen historia - advanced_inspector: Ikuskaria - advanced_minimise: Leihoa txikiagotu - advanced_parallel: Bide paraleloa - advanced_undelete: Desezabatu - advice_deletingpoi: POI ezabatzen (Z desegiteko) - advice_deletingway: Bidea ezabatzen (Z desegiteko) - advice_nocommonpoint: Bideek ez dute puntu komunik partekatzen - advice_revertingway: Itzultzen aurreko bide gordera (Z desegiteko) - advice_toolong: Oso luzea babesa kentzeko - zati ezaz bide motzagoetan, mesedez - cancel: Ezeztatu - conflict_poichanged: Editatzen hasi zinenetik, norbaitek aldatu du $1$2 puntua. - conflict_visitpoi: Egin klik 'Ok' gainean puntua ezabatzeko - conflict_visitway: Sakatu 'Ok' bidea erakusteko. - custom: "Pertsonalizatua:" - delete: Ezabatu - drag_pois: Intereseko puntuak hautatu eta ekarri - editinglive: Zuzenean aldatzen - heading_drawing: Marrazten - heading_introduction: Sarrera - heading_pois: Hasten - heading_quickref: Erreferentzia azkarra - help: Laguntza - hint_latlon: "lat. $1\nlon. $2" - hint_loading: datuak kargatzen - hint_saving: datuak gordetzen - inspector: Ikuskaria - inspector_in_ways: Bideetan - inspector_latlon: "Lat $1\nLon $2" - inspector_locked: Babesturik - inspector_unsaved: Gorde gabe - inspector_uploading: (igotzen) - inspector_way_connects_to_principal: $1 $2(e)ra eta beste $3 $4(e)ra konektatzen - inspector_way_nodes: $1 nodo - loading: Kargatzen... - login_pwd: "Pasahitza:" - login_retry: Zure sarrera ez da aurkitu. Mesedez, saia zaitez berriro ere. - login_title: Ezin izan da sartu - login_uid: Erabiltzaile izena - mail: Posta - more: Gehiago - "no": Ez - nobackground: Atzealderik gabe - offset_choose: Aukeratu irteera (m) - offset_dual: Autobia (D2) - offset_motorway: Autobidea (D3) - ok: Ados - option_layer_cycle_map: OSM - bizikleta bidea - option_layer_maplint: OSM - Maplint (akatsak) - option_layer_ooc_25k: "UK historikoa: 1:25.000" - option_layer_ooc_7th: "UK historikoa: 7.a" - option_layer_ooc_scotland: "UK historikoa: Eskozia" - option_layer_os_streetview: "UK: OS StreetView" - option_layer_streets_haiti: "Haiti: kale-izenak" - option_photo: "KML argazkia:" - option_thinareas: Erabili lerro finagoak eremuentzat - option_warnings: Erakutsi oharrak gainean - point: Puntu - preset_icon_airport: Aireportu - preset_icon_bar: Taberna - preset_icon_bus_stop: Autobus geralekua - preset_icon_cafe: Kafetegi - preset_icon_cinema: Zinema - preset_icon_disaster: Haitiko eraikina - preset_icon_fast_food: Janari lasterra - preset_icon_ferry_terminal: Ferrya - preset_icon_fire_station: Suhiltzaileak - preset_icon_hospital: Ospitale - preset_icon_hotel: Hotel - preset_icon_museum: Museo - preset_icon_parking: Aparkaleku - preset_icon_pharmacy: Farmazia - preset_icon_place_of_worship: Otoitzerako lekua - preset_icon_police: Polizia-etxea - preset_icon_post_box: Postontzia - preset_icon_recycling: Birziklatzen - preset_icon_restaurant: Jatetxe - preset_icon_school: Eskola - preset_icon_station: Tren geltokia - preset_icon_supermarket: Supermerkatu - preset_icon_taxi: Taxi geltokia - preset_icon_telephone: Telefono - preset_icon_theatre: Antzoki - prompt_addtorelation: Gehitu $1 bilduma batean - prompt_closechangeset: $1 aldaketa multzoa itxi - prompt_createparallel: Sortu bide paraleloa - prompt_editlive: Zuzenean aldatu - prompt_helpavailable: Erabiltzaile berria? Laguntza duzu behean ezkerrealdean - prompt_launch: Kanpoko URLa hasi - prompt_manyways: Eremu honek detaile asko ditu eta denbora handia beharko du kargatzeko. Nahi al duzu zoom egitea? - prompt_revertversion: "Itzuli aurretik gordetako bertsio batera:" - prompt_savechanges: Aldaketak gorde - prompt_welcome: Ongi etorri OpenStreetMap-era! - retry: Saiatu berriro - save: Gorde - tags_backtolist: Zerrendara itzuli - tags_descriptions: "'$1'en deskribapena" - tags_findtag: Etiketa bat aurkitu - tip_addrelation: Erlazio bati gehitu - tip_addtag: Etiketa bat gehitu - tip_clockwise: Erlojuaren aldeko bide zirkularra - egin klik alderantziz jartzeko - tip_noundo: Ez dago ezer desegiteko - tip_photo: Argazkiak kargatu - tip_undo: Desegin $1 (Z) - uploading: Igotzen... - uploading_deleting_pois: POIak ezabatzen - uploading_deleting_ways: Bideak ezabatzen - uploading_poi: $1 POI igotzen - uploading_way_name: $1, $2 bidea igotzen - warning: Kontuz! - way: Bide - "yes": Bai diff --git a/config/potlatch/locales/fa.yml b/config/potlatch/locales/fa.yml deleted file mode 100644 index 5d0a3ef14..000000000 --- a/config/potlatch/locales/fa.yml +++ /dev/null @@ -1,230 +0,0 @@ -# Messages for Persian (فارسی) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Grille chompa -# Author: Reza1615 -# Author: Sahim -fa: - a_poi: $1 یک POI - a_way: $1 یک راه - action_addpoint: اضافه کردن یک گره به پایان راه - action_cancelchanges: " لغو تغییرات به" - action_changeway: تغییرات مسیر - action_createparallel: ایجاد راه‌های موازی - action_createpoi: ایجاد POI - action_deletepoint: حذف کردن یک نقطه - action_insertnode: اضافه کردن یک گره به راه - action_mergeways: ادغام دو راه - action_movepoi: حرکت به بعد - action_movepoint: حرکت دادن نقطه - action_moveway: جابجایی یک مسیر - action_pointtags: تنظیم برچسب‌ها روی یک نقطه - action_poitags: تنظیم برچسب‌ها روی یک راه - action_reverseway: معکوس کردن یک راه - action_revertway: بازگشتن به‌یک راه - action_splitway: قطعه قطعه کردن راه - action_waytags: تنظیم برچسب‌ها روی یک راه - advanced: پیشرفته - advanced_close: بستن تغییرات - advanced_history: تاریخچه مسیر - advanced_inspector: بازرس - advanced_maximise: به‌حداکثررسانی پنجره - advanced_minimise: به‌حداقل‌رسانی پنجره - advanced_parallel: راه موازی - advanced_tooltip: ویرایش پیشرفته - advanced_undelete: احیا - advice_bendy: بسیار خمیده هست و برای صاف کردن (تغییر به زور) - advice_conflict: " تداخل سرور- ممکن است نیاز به ذخیره مجدد باشد" - advice_deletingpoi: حذف پی‌او‌آی (Z برای باطل کردن) - advice_deletingway: حذف راه (Z برای باطل کردن) - advice_microblogged: بروز رسانی وضعیت $1 شما - advice_nocommonpoint: راه‌ها نقطه مشترک ندارند - advice_revertingpoi: برگشتن به آخرین راه ذخیره شده (Z برای باطل کردن) - advice_revertingway: برگشتن به آخرین راه ذخیره شده (Z برای باطل کردن) - advice_tagconflict: برچسب ها مطابقت ندارد -- لطفا کنترل کنید (Z خنثی سازی) - advice_toolong: برای باز کردن قفل بسیار طولانی هست-لطفا به مسیرهای کوچک‌تر تقسیم کنید - advice_uploadempty: هیچ چیز برای آپلود - advice_uploadfail: بارگذاری متوقف‌شد - advice_uploadsuccess: کلیه داده ها با موفقیت ارسال شده - advice_waydragged: راه کشیده شده (خنثی سازی Z) - cancel: لغو - closechangeset: بستن تغییرات - conflict_download: دانلود نسخه آنها - conflict_overwrite: باز نویسی نسخه آنها - conflict_poichanged: از زمانی که شما شروع به ویرایش کردی، شخص دیگری نقطه $1$2 را تغییر داده است. - conflict_relchanged: از زمانی که شما شروع به ویرایش کردی، شخص دیگری ارتباطات $1$2 را تغییر داده است. - conflict_visitpoi: کلید 'تایید' را بفشارید تا راه نمایش داده‌شود - conflict_visitway: کلید 'تایید' را بفشارید تا راه نمایش داده‌شود - conflict_waychanged: از زمانی که شما شروع به ویرایش کردی، شخص دیگری مسیر $1$2 را تغییر داده است. - createrelation: ایجاد یک ارتباط جدید - custom: "سفارشی:" - delete: حذف - deleting: حذف - drag_pois: کشیدن و رها کردن نقاط مورد علاقه - editinglive: ویرایش زنده و برخط - editingoffline: ویرایش خط‌خاموش - emailauthor: \ n\n لطفا به نشانی richard@systemeD.net پست الکترونیک بفرستید و همراه با گزارش اشکال آنچه در آن زمان انجام دادید را بیان کنید. - error_anonymous: شما نمی ـوانید با نقشه ‌کش ناشناس تماس بگیرید - error_connectionfailed: شرمنده - ارتباز با سرور نقشه‌باز‌شهری مشکل دارد. تغییرات اخیر ذخیره نشد!\n\nآیا میخواهید دوباره تلاش کنید ؟ - error_microblog_long: "ارسال به $1 شکست خورد:\nکد HTTP: $2\nپیغام خطا: $3\n$1 خطا: $4" - error_nopoi: پی‌آی‌او یافت نشد(شاید شما دور هستید؟) بنابراین من نمی توانم بازگردانی کنم - error_nosharedpoint: راههای $ 1 و $ 2 را نقطه مشترک ندارند ، بنابراین من نمی تواند تقسیم کردن را لغو کنیم. - error_noway: مسیر $1 یافت نشد شاید شما دور هستید؟ بنابراین نمی توانم خنثی کنم - error_readfailed: شرنده-سرور نقشه‌باز‌شهری برای اطلاعات خواسته شده پاسخ نمی دهد\n\nآیا میخواهید دوباره تلاش کنید ? - existingrelation: اضافه کردن به رابطه های موجود - findrelation: پیداکردن رابطه محتوایی - gpxpleasewait: لطفا صبر کنید تا مسیر جی‌پی‌اکس پردازش شود. - heading_drawing: ترسیم - heading_introduction: مقدمه - heading_pois: شروع - heading_quickref: ارجاع سریع - heading_surveying: نقشه‌برداری - heading_tagging: برچسب زدن - heading_troubleshooting: عیب یابی - help: راهنما - hint_drawmode: برای افزودن نقطه کلیک کنید\n دوتا کلیک و/بازگشت\nبه انتهای خط - hint_latlon: "عرض $1\nطول $2" - hint_loading: بارگذاری داده ها - hint_overendpoint: بالای نقطه پایانی ($1)\n برای اتصال کلیک کنید\n دکمه شیف+ کلیک برای ادغام - hint_overpoint: ($1) نقطه بالا \n برای پیوستن کلیک کنید - hint_pointselected: نقطه انتخاب شده\n(شیفت همراه با کلیک نقطه\n شروع خط جدید) - hint_saving: ذخیره داده‌ها - hint_saving_loading: بارگذاری / ذخیره اطلاعات - inspector: بازرس - inspector_duplicate: نسخه تکراری از - inspector_in_ways: در راه‌ها - inspector_latlon: "عرض $1\nطول $2" - inspector_locked: قفل‌شده - inspector_node_count: ($1 بار) - inspector_not_in_any_ways: در هیچ مسیری (POI) - inspector_unsaved: ذخیره نشده - inspector_uploading: (درحال بارگذاری) - inspector_way_connects_to: اتصال به $ 1 راه - inspector_way_connects_to_principal: متصل به $1 $2 و 3 $ دیگر $4 - inspector_way_nodes: $1 بار - inspector_way_nodes_closed: $1 نقطه (بسته) - loading: در حال بارگذاری... - login_pwd: "کلمه عبور:" - login_retry: ورود به سایت شما بود به رسمیت شناخته شده نیست. لطفا دوباره سعی کنید. - login_title: نمی‌توانید به سامانه وارد شوید - login_uid: "نام کاربری:" - mail: پست - more: بیشتر - newchangeset: "لطفا دوباره سعی کنید: نشست شما خواهان شروع یک تغییر جدید است." - "no": خیر - nobackground: بدون هیچ پس‌زمینه‌ای - norelations: در منطقه فعلی رابطه‌ای وجود ندارد - offset_broadcanal: کانال پهن towpath - offset_choose: جبران انتخاب (متر) - offset_dual: راه کالسکه‌رو دوگانه (D2) - offset_motorway: بزرگراه (D3) - offset_narrowcanal: کانال باریک towpath - ok: تأیید - openchangeset: شروع تغییرات - option_custompointers: استفاده از قلم و دست اشاره گر - option_external: راه‌انداز خارجی - option_fadebackground: محو شدن پس زمینه - option_layer_cycle_map: نقشه‌باز‌شهری - نقشه مسیر دوچرخه - option_layer_maplint: OSM - Maplint (خطا) - option_layer_nearmap: "استرالیا: NearMap" - option_layer_ooc_25k: "K تاریخی بریتانیا: 1:25" - option_layer_ooc_7th: تاریخچه انگلستان :هفتمین - option_layer_ooc_npe: تاریخچه انگلستان:NPE - option_layer_ooc_scotland: "تاریخی بریتانیا: اسکاتلند" - option_layer_os_streetview: "UK: OS StreetView" - option_layer_streets_haiti: "هائیتی : نام خیابان" - option_layer_surrey_air_survey: "بریتانیا : بررسی هوا سوری" - option_layer_tip: پس زمینه برای نمایش انتخاب کنید - option_limitways: اخطار برای بارگذاری اطلاعات زیاد - option_microblog_id: "نام میکروبلاگ:" - option_microblog_pwd: "رمز عبور میکروبلاگ:" - option_noname: برجسته سازی جاده‌های بدون نام - option_photo: "تصویر KML:" - option_thinareas: از خطوط نازکتر برای مناطق استفاده کنید - option_thinlines: استفاده از خطوط نازک در همه مقیاس‌ها - option_tiger: ببرهای بدون تغییر برجسته - option_warnings: نشان دادن اخطار شناور - point: نقطه - preset_icon_airport: فرودگاه - preset_icon_bar: نوار - preset_icon_bus_stop: ایستگاه اتوبوس - preset_icon_cafe: کافه - preset_icon_cinema: سینما - preset_icon_convenience: فروشگاه تسهیلات - preset_icon_disaster: ساختار هائیتی - preset_icon_fast_food: فست فود - preset_icon_ferry_terminal: گذرگاه - preset_icon_fire_station: ایستگاه اتش نشانی - preset_icon_hospital: بیمارستان - preset_icon_hotel: هتل - preset_icon_museum: موزه - preset_icon_parking: پارکینگ - preset_icon_pharmacy: داروخانه - preset_icon_place_of_worship: معبد - preset_icon_police: کلانتری - preset_icon_post_box: صندوق پست - preset_icon_pub: میخانه - preset_icon_recycling: بازیافت - preset_icon_restaurant: رستوران - preset_icon_school: مدرسه - preset_icon_station: ایستگاه راه آهن - preset_icon_supermarket: سوپرمارکت - preset_icon_taxi: تاکسی - preset_icon_telephone: تلفنعمومی - preset_icon_theatre: تئاتر - preset_tip: از یک منو از پیش تنظیم شده تگ توصیف $1 را انتخاب کنید - prompt_addtorelation: اضافه کردن $1 به رابطه - prompt_changesetcomment: "شرحی از تغییرات خود را وارد کنید:" - prompt_closechangeset: بستن تغییرات $1 - prompt_createparallel: ساخت راه موازی - prompt_editlive: ویرایش زنده و برخط - prompt_editsave: ویرایش با ذخیره - prompt_helpavailable: کاربر جدید هستید؟ برای کمک گرفتن به پایین سمت چپ نگاه کنید - prompt_launch: راه اندازی آدرس خارجی - prompt_live: در حالت زنده (live) تمام تغییرات شما در پایگاه‌داده نقشه‌باز‌شهری به صورت مداوم ذخیره می‌شود و برای مبتدیان پیشنهاد نمی‌شود آیا مطمئن هستید؟ - prompt_manyways: این منطقه بسیار دقیق است و مدت زمان طولانی برای بارگذاری نیاز هست .آیا ترجیح میدهید که بزرگنمایی تصویر را بیشتر کنید؟ - prompt_microblog: ارسال به $1 ($2 چپ) - prompt_revertversion: واگردانی به نزدیک‌ترین نسخه ذخیره‌شده - prompt_savechanges: ذخیرهٔ تغییرات - prompt_taggedpoints: بعضی از نقاط موجود در این مسیر برچسب یا پیوند دارند آیا هنوز قصد حذف کردن دارید؟ - prompt_track: تبدیل جی‌پی‌اس به مسیریاب راه - prompt_unlock: برای بازگشایی قفل کلیک کنید - prompt_welcome: به نقشه‌باز‌شهری خوش آمدید - retry: دوباره - revert: واگردانی - save: ذخیره - tags_backtolist: بازگشت به فهرست - tags_descriptions: شرح '$ 1' - tags_findatag: پیداکردن برچسب - tags_findtag: پیداکردن برچسب - tags_matching: تگ های محبوب مطابق '$ 1' - tags_typesearchterm: "برای یافتن کلمه‌ای بنویسید:" - tip_addrelation: اضافه کردن به رابطه - tip_addtag: افزودن برچسب تازه - tip_alert: خطا رخ داده است - برای اطلاعات بیشتر کلیک کنید - tip_anticlockwise: جهت عقربه های ساعت گرد راه -برای تغییر جهت کلیک کنید - tip_clockwise: جهت عقربه های ساعت گرد راه -برای تغییر جهت کلیک کنید - tip_direction: " جهت راه - کلیک کنید تا به عقب برگردید" - tip_gps: نمایش مسیر جی‌پی‌اس (G) - tip_noundo: هیچ چیز برای خنثی‌سازی نیست - tip_options: (تنظیم گزینه ها (پس زمینه نقشه انتخاب کنید - tip_photo: بارگذاری تصاویر - tip_presettype: مشخص کنید کدام نوع از پیش تعریف‌ها در منو پیشنهاد شود - tip_repeattag: برچسب‌ها را از مسیرهای قبلی تکرار کنید (R) - tip_revertversion: تاریخ برگردانی را انتخاب کنید - tip_selectrelation: اضافه کردن به مسیر انتخاب شده - tip_splitway: تقسیم مسیر در نقاط انتخاب شده (X) - tip_tidy: نقاط مرتب در مسیر (T) - tip_undo: خنثی‌سازی $1 (Z) - uploading: درحال بارگذاری... - uploading_deleting_pois: حذف پی‌او‌آی - uploading_deleting_ways: حذف راه‌ها - uploading_poi: درحال بارگذاری پی‌او‌آی $1 - uploading_poi_name: درحال بارگذاری راه $1 و $2 - uploading_relation: ارتباط آپلود 1$ - uploading_relation_name: بارگذاری ارتباز $1,$2 - uploading_way: درحال بارگذاری راه $1 - uploading_way_name: درحال بارگذاری راه $1 و $2 - warning: اخطار! - way: راه - "yes": بله diff --git a/config/potlatch/locales/fi.yml b/config/potlatch/locales/fi.yml deleted file mode 100644 index c726f6584..000000000 --- a/config/potlatch/locales/fi.yml +++ /dev/null @@ -1,155 +0,0 @@ -# Messages for Finnish (Suomi) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Crt -# Author: Nike -# Author: Ramilehti -# Author: Silvonen -# Author: Str4nd -# Author: Usp -fi: - a_poi: $1 POI - a_way: $1 tie - action_addpoint: pisteen lisääminen tien perään - action_cancelchanges: peruutetaan muutokset - action_changeway: muutokset polkuun - action_createpoi: POI:n lisääminen - action_deletepoint: pisteen poistaminen - action_insertnode: pisteen lisääminen tiehen - action_mergeways: kahden tien yhdistäminen - action_movepoi: POI:n siirtäminen - action_movepoint: pisteen lisääminen - action_moveway: tien siirtäminen - action_pointtags: pisteen tagien asettaminen - action_poitags: POI:n tagien asettaminen - action_reverseway: tien kääntäminen - action_revertway: polun kääntäminen - action_splitway: tien katkaisu - action_waytags: tien tagien asettaminen - advanced: Aputoiminnot - advanced_close: Sulje muutoskokoelma - advanced_history: Polun historia - advanced_inspector: Tietotyökalu - advanced_maximise: Suurenna ikkuna - advanced_minimise: Pienennä ikkuna - advanced_parallel: Rinnakkainen polku - advanced_tooltip: Lisätoimintoja - advanced_undelete: Palauta - advice_bendy: Liian mutkainen suoristettavaksi (SHIFT pakottaa) - advice_conflict: Ristiriita palvelimella – saatat joutua kokeilemaan tallennusta uudelleen - advice_deletingpoi: Poistetaan POI (Z kumoaa) - advice_deletingway: Poistetaan tie (Z kumoaa) - advice_nocommonpoint: Tiet eivät jaa yhteistä pistettä - advice_tagconflict: Tagit eivät täsmää - tarkista asia - advice_toolong: Liian pitkän tien lukituksen poisto ei sallittu - katkaise lyhyemmiksi teiksi. - advice_uploadempty: Ei mitään lähetettävää - advice_uploadfail: Lähetys pysäytetty - advice_uploadsuccess: Tietojen lähetys onnistui - advice_waydragged: Tietä siirrettiin (paina Z kumotaksesi) - cancel: Peruuta - closechangeset: Suljetaan muutoskokoelma - conflict_visitpoi: Näytä piste valitsemalla OK. - conflict_visitway: Näytä tie valitsemalla OK. - createrelation: Luo uusi relaatio - custom: "Mukautettu:" - delete: Poista - deleting: poistaminen - drag_pois: Vedä ja pudota kiinnostavat kohteet - editinglive: Muutokset tallentuvat hetit - editingoffline: Muokataan paikallisesti - emailauthor: \n\nLähetäthän sähköpostia, jossa kerrot mitä olit tekemässä, osoitteeseen richard\@systemeD.net mieluiten englanniksi. - error_anonymous: Et voi ottaa yhteyttä anonyymiin kartoittajaan. - error_connectionfailed: "Yhteyttä OSM-palvelimeen ei saatu. Tuoreita muutoksia ei ole tallennettu.\n\nHaluatko yrittää uudestaan?" - error_nopoi: POI:ta ei löydetä (ehkä vieritit siitä liian kauaksi), joten peruminen ei onnistu. - error_nosharedpoint: Teillä $1 ja $2 ei enää ole yhteistä solmua, joten tien katkaisua ei voi perua. - error_noway: Tietä $1 ei löydy (ehkä vieritit siitä liian kauaksi), joten kumoaminen ei onnistu. - error_readfailed: OpenStreetMap-palvelin ei vastannut haettaessa tietoja.\n\nHaluatko yrittää uudelleen? - existingrelation: Lisää olemassa olevaan relaatioon - findrelation: Etsi relaatio, joka sisältää - gpxpleasewait: Odota. GPX-jälkeä käsitellään. - heading_introduction: Johdanto - heading_quickref: Pikaopas - heading_tagging: Merkinnät - help: Ohje - help_html: "Tervetuloa käyttämään Potlatch-muokkainta\nPotlatch is the easy-to-use editor for OpenStreetMap. Draw roads, paths, landmarks and shops from your GPS surveys, satellite imagery or old maps.\n\nThese help pages will take you through the basics of using Potlatch, and tell you where to find out more. Click the headings above to begin.\n\nWhen you've finished, just click anywhere else on the page.\n\n\n\nHyvä tietää\nÄlä kopioi muista kartoista!\n\nIf you choose 'Edit live', any changes you make will go into the database as you draw them - like, immediately. If you're not so confident, choose 'Edit with save', and they'll only go in when you press 'Save'.\n\nAny edits you make will usually be shown on the map after an hour or two (a few things take a week). Not everything is shown on the map - it would look too messy. But because OpenStreetMap's data is open source, other people are free to make maps showing different aspects - like OpenCycleMap or Midnight Commander.\n\nRemember it's both a good-looking map (so draw pretty curves for bends) and a diagram (so make sure roads join at junctions).\n\nDid we mention about not copying from other maps?\n\n\nFind out more\nPotlatch manual\nSähköpostilistat\nOnline chat (live help)\nKeskustelualue\nYhteisöwiki\nPotlatch source-code\n\n\n\nGetting started\nNow that you have Potlatch open, click 'Edit with save' to get started.\n\nSo you're ready to draw a map. The easiest place to start is by putting some points of interest on the map - or \"POIs\". These might be pubs, churches, railway stations... anything you like.\n\nDrag and drop\nTo make it super-easy, you'll see a selection of the most common POIs, right at the bottom of the map for you. Putting one on the map is as easy as dragging it from there onto the right place on the map. And don't worry if you don't get the position right first time: you can drag it again until it's right. Note that the POI is highlighted in yellow to show that it's selected.\n\nOnce you've done that, you'll want to give your pub (or church, or station) a name. You'll see that a little table has appeared at the bottom. One of the entries will say \"name\" followed by \"(type name here)\". Do that - click that text, and type the name.\n\nClick somewhere else on the map to deselect your POI, and the colourful little panel returns.\n\nEasy, isn't it? Click 'Save' (bottom right) when you're done.\nMoving around\nTo move to a different part of the map, just drag an empty area. Potlatch will automatically load the new data (look at the top right).\n\nWe told you to 'Edit with save', but you can also click 'Edit live'. If you do this, your changes will go into the database straightaway, so there's no 'Save' button. This is good for quick changes and mapping parties.\n\nNext steps\nHappy with all of that? Great. Click 'Surveying' above to find out how to become a real mapper!\n\nSurveying with a GPS\nThe idea behind OpenStreetMap is to make a map without the restrictive copyright of other maps. This means you can't copy from elsewhere: you must go and survey the streets yourself. Fortunately, it's lots of fun!\nThe best way to do this is with a handheld GPS set. Find an area that isn't mapped yet, then walk or cycle up the streets with your GPS switched on. Note the street names, and anything else interesting (pubs? churches?) , as you go along.\n\nWhen you get home, your GPS will contain a 'tracklog' recording everywhere you've been. You can then upload this to OpenStreetMap.\n\nThe best type of GPS is one that records to the tracklog frequently (every second or two) and has a big memory. Lots of our mappers use handheld Garmins or little Bluetooth units. There are detailed GPS Reviews on our wiki.\n\nUploading your track\nNow, you need to get your track off the GPS set. Maybe your GPS came with some software, or maybe it lets you copy the files off via USB. If not, try GPSBabel. Whatever, you want the file to be in GPX format.\n\nThen use the 'GPS Traces' tab to upload your track to OpenStreetMap. But this is only the first bit - it won't appear on the map yet. You must draw and name the roads yourself, using the track as a guide.\nUsing your track\nFind your uploaded track in the 'GPS Traces' listing, and click 'edit' right next to it. Potlatch will start with this track loaded, plus any waypoints. You're ready to draw!\n\nYou can also click this button to show everyone's GPS tracks (but not waypoints) for the current area. Hold Shift to show just your tracks.\nUsing satellite photos\nIf you don't have a GPS, don't worry. In some cities, we have satellite photos you can trace over, kindly supplied by Yahoo! (thanks!). Go out and note the street names, then come back and trace over the lines.\n\nIf you don't see the satellite imagery, click the options button and make sure 'Yahoo!' is selected. If you still don't see it, it's probably not available for your city, or you might need to zoom out a bit.\n\nOn this same options button you'll find a few other choices like an out-of-copyright map of the UK, and OpenTopoMap for the US. These are all specially selected because we're allowed to use them - don't copy from anyone else's maps or aerial photos. (Copyright law sucks.)\n\nSometimes satellite pics are a bit displaced from where the roads really are. If you find this, hold Space and drag the background until it lines up. Always trust GPS tracks over satellite pics.\n\nDrawing ways\nTo draw a road (or 'way') starting at a blank space on the map, just click there; then at each point on the road in turn. When you've finished, double-click or press Enter - then click somewhere else to deselect the road.\n\nTo draw a way starting from another way, click that road to select it; its points will appear red. Hold Shift and click one of them to start a new way at that point. (If there's no red point at the junction, shift-click where you want one!)\n\nClick 'Save' (bottom right) when you're done. Save often, in case the server has problems.\n\nDon't expect your changes to show instantly on the main map. It usually takes an hour or two, sometimes up to a week.\nMaking junctions\nIt's really important that, where two roads join, they share a point (or 'node'). Route-planners use this to know where to turn.\n\nPotlatch takes care of this as long as you are careful to click exactly on the way you're joining. Look for the helpful signs: the points light up blue, the pointer changes, and when you're done, the junction point has a black outline.\nMoving and deleting\nThis works just as you'd expect it to. To delete a point, select it and press Delete. To delete a whole way, press Shift-Delete.\n\nTo move something, just drag it. (You'll have to click and hold for a short while before dragging a way, so you don't do it by accident.)\nMore advanced drawing\nIf two parts of a way have different names, you'll need to split them. Click the way; then click the point where it should be split, and click the scissors. (You can merge ways by clicking with Control, or the Apple key on a Mac, but don't merge two roads of different names or types.)\n\nRoundabouts are really hard to draw right. Don't worry - Potlatch can help. Just draw the loop roughly, making sure it joins back on itself at the end, then click this icon to 'tidy' it. (You can also use this to straighten out roads.)\nPoints of interest\nThe first thing you learned was how to drag-and-drop a point of interest. You can also create one by double-clicking on the map: a green circle appears. But how to say whether it's a pub, a church or what? Click 'Tagging' above to find out!\n\nWhat type of road is it?\nOnce you've drawn a way, you should say what it is. Is it a major road, a footpath or a river? What's its name? Are there any special rules (e.g. \"no bicycles\")?\n\nIn OpenStreetMap, you record this using 'tags'. A tag has two parts, and you can have as many as you like. For example, you could add highway | trunk to say it's a major road; highway | residential for a road on a housing estate; or highway | footway for a footpath. If bikes were banned, you could then add bicycle | no. Then to record its name, add name | Market Street.\n\nThe tags in Potlatch appear at the bottom of the screen - click an existing road, and you'll see what tags it has. Click the '+' sign (bottom right) to add a new tag. The 'x' by each tag deletes it.\n\nYou can tag whole ways; points in ways (maybe a gate or a traffic light); and points of interest.\nUsing preset tags\nTo get you started, Potlatch has ready-made presets containing the most popular tags.\n\nSelect a way, then click through the symbols until you find a suitable one. Then, choose the most appropriate option from the menu.\n\nThis will fill the tags in. Some will be left partly blank so you can type in (for example) the road name and number.\nOne-way roads\nYou might want to add a tag like oneway | yes - but how do you say which direction? There's an arrow in the bottom left that shows the way's direction, from start to end. Click it to reverse.\nChoosing your own tags\nOf course, you're not restricted to just the presets. By using the '+' button, you can use any tags at all.\n\nYou can see what tags other people use at OSMdoc, and there is a long list of popular tags on our wiki called Map Features. But these are only suggestions, not rules. You are free to invent your own tags or borrow from others.\n\nBecause OpenStreetMap data is used to make many different maps, each map will show (or 'render') its own choice of tags.\nRelations\nSometimes tags aren't enough, and you need to 'group' two or more ways. Maybe a turn is banned from one road into another, or 20 ways together make up a signed cycle route. You can do this with an advanced feature called 'relations'. Find out more on the wiki.\n\nUndoing mistakes\nThis is the undo button (you can also press Z) - it will undo the last thing you did.\n\nYou can 'revert' to a previously saved version of a way or point. Select it, then click its ID (the number at the bottom left) - or press H (for 'history'). You'll see a list of everyone who's edited it, and when. Choose the one to go back to, and click Revert.\n\nIf you've accidentally deleted a way and saved it, press U (for 'undelete'). All the deleted ways will be shown. Choose the one you want; unlock it by clicking the red padlock; and save as usual.\n\nThink someone else has made a mistake? Send them a friendly message. Use the history option (H) to select their name, then click 'Mail'.\n\nUse the Inspector (in the 'Advanced' menu) for helpful information about the current way or point.\nFAQs\nHow do I see my waypoints?\nWaypoints only show up if you click 'edit' by the track name in 'GPS Traces'. The file has to have both waypoints and tracklog in it - the server rejects anything with waypoints alone.\n\nMore FAQs for Potlatch and OpenStreetMap.\n\n\n\nWorking faster\nThe further out you're zoomed, the more data Potlatch has to load. Zoom in before clicking 'Edit'.\n\nTurn off 'Use pen and hand pointers' (in the options window) for maximum speed.\n\nIf the server is running slowly, come back later. Check the wiki for known problems. Some times, like Sunday evenings, are always busy.\n\nTell Potlatch to memorise your favourite sets of tags. Select a way or point with those tags, then press Ctrl, Shift and a number from 1 to 9. Then, to apply those tags again, just press Shift and that number. (They'll be remembered every time you use Potlatch on this computer.)\n\nTurn your GPS track into a way by finding it in the 'GPS Traces' list, clicking 'edit' by it, then tick the 'convert' box. It'll be locked (red) so won't save. Edit it first, then click the red padlock to unlock when ready to save.\n\nWhat to click\nDrag the map to move around.\nDouble-click to create a new POI.\nSingle-click to start a new way.\nHold and drag a way or POI to move it.\nWhen drawing a way\nDouble-click or press Enter to finish drawing.\nClick another way to make a junction.\nShift-click the end of another way to merge.\nWhen a way is selected\nClick a point to select it.\nShift-click in the way to insert a new point.\nShift-click a point to start a new way from there.\nControl-click another way to merge.\n\nKeyboard shortcuts\nB Add background source tag\nC Close changeset\nG Show GPS tracks\nH Show history\nI Show inspector\nJ Join point to what's below ways\n(+Shift) Unjoin from other ways\nK Lock/unlock current selection\nL Show current latitude/longitude\nM Maximise editing window\nP Create parallel way\nR Repeat tags\nS Save (unless editing live)\nT Tidy into straight line/circle\nU Undelete (show deleted ways)\nX Cut way in two\nZ Undo\n- Remove point from this way only\n+ Add new tag\n/ Select another way sharing this point\nDelete Delete point\n (+Shift) Delete entire way\nReturn Finish drawing line\nSpace Hold and drag background\nEsc Abort this edit; reload from server\n0 Remove all tags\n1-9 Select preset tags\n (+Shift) Select memorised tags\n (+S/Ctrl) Memorise tags\n§ or ` Cycle between tag groups\n\n" - hint_drawmode: napsauta lisätäksesi pisteen\nKaksoisnapsauta tai paina enter päättääksesi tien - hint_loading: ladataan teitä - hint_overendpoint: päätepisteen päällä\nnapsauta sulkeaksesi\nshift-napsauta yhdistääksesi - hint_overpoint: pisteen päällä\nnapsauta yhdistääksesi" - hint_pointselected: piste valittuna\n(shift-klikkaa pistettä\naloittaaksesi uuden tien) - hint_saving: tallennetaan tietoja - loading: Ladataan... - login_pwd: "Salasana:" - login_retry: Sisäänkirjautuminen epäonnistui. Yritä uudelleen. - login_title: Ei voinut kirjautua sisään - login_uid: "Käyttäjätunnus:" - more: Lisää - newchangeset: "Yritä uudelleen: Potlatch avaa uuden muutoskokoelman" - "no": Ei - nobackground: Ei taustaa - norelations: Nykyisellä alueella ei ole relaatioita - ok: OK - openchangeset: Avataan muutoskokoelma - option_custompointers: Käytä kynä- ja käsikohdistimia - option_fadebackground: Himmeä tausta - option_layer_streets_haiti: "Haiti: kadunnimet" - option_microblog_id: "Mikroblogin nimi:" - option_microblog_pwd: "Mikroblogin salasana:" - option_noname: Korosta nimeämättömät tiet - option_photo: "Valokuva-KML:" - option_thinareas: Käytä ohuempia viivoja alueille - option_thinlines: Käytä aina ohuita viivoja - option_warnings: Näytä siirtymisvaroitukset - point: Piste - preset_icon_airport: Lentokenttä - preset_icon_bar: Baari - preset_icon_cafe: Kahvila - preset_icon_cinema: Elokuvateatteri - preset_icon_fast_food: Pikaruoka - preset_icon_ferry_terminal: Lautta - preset_icon_fire_station: Paloasema - preset_icon_hospital: Sairaala - preset_icon_hotel: Hotelli - preset_icon_museum: Museo - preset_icon_parking: Pysäköinti - preset_icon_pharmacy: Apteekki - preset_icon_police: Poliisiasema - preset_icon_restaurant: Ravintola - preset_icon_school: Koulu - preset_icon_station: Rautatieasema - preset_icon_telephone: Puhelin - preset_icon_theatre: Teatteri - prompt_addtorelation: Lisää $1 relaatioon - prompt_changesetcomment: "Anna kuvaus muutoksillesi:" - prompt_closechangeset: Sulje muutoskokoelma $1 - prompt_createparallel: Luo rinnakkainen polku - prompt_editlive: Muutokset tallentuvat heti - prompt_editsave: Muutokset pitää tallentaa - prompt_helpavailable: Uusi käyttäjä? Katso ohjeita alavasemmalta. - prompt_revertversion: "Palauta aiempaan versioon:" - prompt_savechanges: Tallenna muutokset - prompt_taggedpoints: Joihinkin tien pisteisiin on lisätty tageja. Haluatko varmasti perua? - prompt_track: Muunna GPX-jälki lukituiksi teiksi muokkausta varten - prompt_welcome: Tervetuloa OpenStreetMapiin - retry: Yritä uudelleen - save: Tallenna - tip_addrelation: Lisää relaatio - tip_addtag: Lisää uusi tagi - tip_alert: Tapahtui virhe - napsauta saadaksesi lisätietoja - tip_anticlockwise: Vastapäivään sulkeutuva tie - napsauta kääntääksesi - tip_clockwise: Myötäpäivään sulkeutuva tie - napsauta kääntääksesi - tip_direction: Tien suunta - napsauta kääntääksesi - tip_gps: Näytä GPS-jäljet (G) - tip_noundo: Ei kumottavaa - tip_options: Asetukset (valitse kartan tausta) - tip_photo: Lataa valokuvia - tip_presettype: Valitse, millaisia pohjia on tarjolla valikossa. - tip_repeattag: Toista tagit viimeksi valitusta tiestä (R) - tip_revertversion: Valitse palautettava versio - tip_selectrelation: Lisää valittuun reittiin - tip_splitway: Katkaise tie valitusta kohdasta (X) - tip_undo: Kumoa $1 (Z) - uploading: Lähetetään... - warning: Varoitus! - way: Tie - "yes": Kyllä diff --git a/config/potlatch/locales/fr.yml b/config/potlatch/locales/fr.yml deleted file mode 100644 index d666179b1..000000000 --- a/config/potlatch/locales/fr.yml +++ /dev/null @@ -1,246 +0,0 @@ -# Messages for French (Français) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Damouns -# Author: EtienneChove -# Author: IAlex -# Author: Jean-Frédéric -# Author: McDutchie -# Author: Peter17 -# Author: Toliño -# Author: Verdy p -fr: - a_poi: $1 un POI - a_way: $1 un chemin - action_addpoint: Ajout d'un point à la fin d'un chemin - action_cancelchanges: Annulation de la modification - action_changeway: modification d'une route - action_createparallel: créer des routes parallèles - action_createpoi: Créer un POI (point d'intérêt) - action_deletepoint: Suppression d'un point - action_insertnode: Ajouter un point sur un chemin - action_mergeways: Joindre deux chemins - action_movepoi: Déplacer un POI - action_movepoint: Déplacer un point - action_moveway: Déplacer un chemin - action_pointtags: entrer les balises sur un point - action_poitags: entrer les balises sur un POI - action_reverseway: Inverser le sens du chemin - action_revertway: rétablir un chemin - action_splitway: Scinder un chemin - action_waytags: entrer les balises sur un chemin - advanced: Avancé - advanced_close: Fermer le groupe de modifications - advanced_history: Historique du chemin - advanced_inspector: Inspecteur - advanced_maximise: Maximiser la fenêtre - advanced_minimise: Réduire la fenêtre - advanced_parallel: Chemin parallèle - advanced_tooltip: Actions de modification avancées - advanced_undelete: Rétablir - advice_bendy: Trop de courbure pour aligner (Maj pour forcer) - advice_conflict: Conflit avec le serveur - vous pourriez à avoir à sauvegarder de nouveau - advice_deletingpoi: Suppression du POI (Z pour annuler) - advice_deletingway: Suppression du chemin (Z pour annuler) - advice_microblogged: Votre statut $1 a été mis à jour - advice_nocommonpoint: Les chemins ne partagent pas de point commun - advice_revertingpoi: Rétablissement au dernier POI sauvegardé (Z pour annuler) - advice_revertingway: Retour au dernier chemin sauvegardé (Z pour annuler) - advice_tagconflict: Les balises ne correspondent pas - Veuillez vérifier - advice_toolong: Trop long pour débloquer la situation - Scindez le chemin en chemins plus courts - advice_uploadempty: Rien à envoyer - advice_uploadfail: Envoi arrêté - advice_uploadsuccess: Toutes les données ont été correctement envoyées - advice_waydragged: Chemin déplacé (Z pour annuler) - cancel: Annuler - closechangeset: Fermeture du groupe de modifications - conflict_download: Télécharger sa version - conflict_overwrite: Écraser sa version - conflict_poichanged: Après le début de votre modification, quelqu'un a modifié le point $1$2. - conflict_relchanged: Après le début de votre modification, quelqu'un a modifié la relation $1$2. - conflict_visitpoi: Cliquez sur « Ok » pour montrer le point. - conflict_visitway: Cliquer sur 'Ok' pour voir le chemin. - conflict_waychanged: Après le début de votre modification, quelqu'un a modifié le chemin $1$2. - createrelation: Créer une nouvelle relation - custom: "Personnalisé :" - delete: Supprimer - deleting: Supprimer - drag_pois: Déplacer des points d'intérêt - editinglive: Modification en direct - editingoffline: Modification hors-ligne - emailauthor: \n\nMerci d'envoyer un e-mail a richard\@systemeD.net pour signaler ce bogue, en expliquant ce que vous faisiez quand il est survenu. - error_anonymous: Vous ne pouvez pas contacter un mappeur anonyme. - error_connectionfailed: Désolé, la connexion au serveur OpenStreetMap a échoué. Vos changements récents ne sont pas enregistrés.\n\nVoulez-vous réessayer ? - error_microblog_long: "La postage vers $1 a échoué :\nCode HTTP : $2\nMessage d'erreur : $3\nErreur de $1 : $4" - error_nopoi: Le point d'intérêt (POI) est introuvable (vous avez peut-être déplacé la vue ?) donc je ne peux pas annuler. - error_nosharedpoint: "Les chemins $1 et $2 n'ont plus de point en commun et ne peuvent donc pas être recollés : l'opération précédente de scindage ne peut être annulée." - error_noway: Le chemin $1 n'a pas été trouvé, il ne peut être restauré à son état précédent. - error_readfailed: Désolés, le serveur d'OpenStreetMap n'a pas répondu à la demande de données.\n\nVoulez-vous réessayer ? - existingrelation: Ajouter à une relation existante - findrelation: Trouver une relation contenant - gpxpleasewait: Veuillez patientez pendant le traitement de la trace GPX - heading_drawing: Dessiner - heading_introduction: Introduction - heading_pois: Comment débuter - heading_quickref: Référence rapide - heading_surveying: Relever - heading_tagging: Balisage - heading_troubleshooting: Dépannage - help: Aide - help_html: "Bienvenue sur Potlatch\nPotlatch est l'éditeur facile à utiliser pour OpenStreetMap. Dessinez des routes, chemins, traces au sol et magasins à partir de vos traces GPS, d'images satellite et d'anciennes cartes.\n\nCes pages d'aide vont vous guider pour les tâches basiques dans l'utilisation de Potlatch et vous indiquer où trouver plus d'informations. Cliquez sur les titres ci-dessus pour commencer.\n\nUne fois que vous avez fini, cliquez simplement ailleurs dans la page.\n\n\n\nChoses utiles à savoir\nNe copiez pas depuis d'autres cartes !\n\nSi vous choisissez « Modifier en direct », toutes les modifications seront transmises à la base de données au fur et à mesure que vous les dessinez (immédiatement !). Si vous ne vous sentez pas sûr, choisissez « Modifier avec sauvegarde », et les modifications ne seront transmises que lorsque vous cliquerez sur « Sauvegarder ».\n\nLes modifications que vous apportez apparaissent habituellement sur la carte après une ou deux heures (quelques modifications peuvent prendre une semaine). Tout n'apparaît pas sur la carte - elle perdrait sa clarté. Mais puisque les données d'OpenStreetMap sont open source, chacun est libre de créer des cartes offrant différents aspects - comme OpenCycleMap ou Midnight Commander.\n\nRappelez-vous qu'il s'agit à la fois d'une jolie carte (donc dessinez de jolies courbes pour les virages) et un diagramme (vérifiez bien que les routes se rejoignent aux jonctions).\n\nAvons-nous bien dit de ne pas copier depuis d'autres cartes ?\n\n\nTrouver plus d'informations\nManuel de Potlatch\nListes de diffusion\nDiscussion en ligne (aide en direct)\nForum web\nWiki de la communauté\nCode source de Potlatch\n\n\n\nCommencer\nMaintenant que vous avez ouvert Potlatch, cliquez sur « Modifier avec sauvegarde » pour commencer.\n\nVous êtes donc prêt à dessiner une carte. Le plus facile, pour commencer, est de placer des points d'intérêt sur la carte - des \"POIs\". Il peut s'agir de bars, d'églises, de gares ferroviaires... tout ce qui vous plaît.\n\nGlisser et déposer\nPour rendre cela super facile, vous verrez une sélection des POI (points d'intérêt) les plus courants, juste en dessous de votre carte. En placer un sur la carte est aussi facile que ça : cliquez-déplacez-le vers son emplacement sur la carte. Et pas d'inquiétude si vous ne le placez pas parfaitement du premier coup : vous pouvez le déplacer encore jusqu'à ce que ce soit bon. Notez que le POI est surligné en jaune pour montrer qu'il est sélectionné.\n\nUne fois que vous aurez effectué cela, vous voudrez donner un nom à votre bar (ou église ou gare). Vous verrez un petit tableau s'afficher un bas. Une des entrées sera « name » suivie de « type name here ». Cliquez sur ce dernier et entrez le nom.\n\nCliquez quelque part d'autre sur la carte pour dé-sélectionner le POI et le petit panneau coloré réapparaitra.\n\nFacile, n'est-ce pas ? Cliquez sur « Sauvegarder » (en bas à droite) quand vous avez fini.\nDéplacer\nPour vous déplacer vers une partie différente de la carte, déplacez une partie vide de la carte. Potlatch chargera automatiquement les nouvelles données (regardez en haut à droite).\n\nNous vous avons précédemment dit que cliquer sur « Modifier avec sauvegarde », mais vous pouvez également cliquer sur « Modifier en direct ». En faisant cela, les modifications seront envoyées directement à la base données, il n'y a donc pas de bouton « Sauvegarder ». Ceci est utile pour les petites modifications et réunions de cartographie.\n\nProchaines étapes\nContent avec tout cela ? Bien. Cliquez sur le bouton « Repérage » ci-dessus pour trouver comment devenir un vrai cartographe !\n\nRepérage avec un GPS\nL'idée derrière OpenStreetMap est de construire une carte sans les droits d'auteur restrictifs des autres cartes. Ceci veut dire que vous ne pouvez pas copier depuis partout : vous devez aller arpenter les rues vous-même. Par chance, ceci est une partie de plaisir !\nLa meilleure manière de le faire est avec un GPS de poche. Trouvez une zone encore non cartographiée, ensuite allez à pied ou en vélo avec votre GPS activé. Relevez le nom des rues et toutes les autres choses intéressantes (bar, églises, ...) pendant votre ballade.\n\nLorsque vous rentrerez chez vous, votre GPS contiendra un \"tracklog\", qui enregistre tous les lieux où vous êtes allé. Vous pouvez ensuite le téléverser vers OpenStreetMap.\n\nLe meilleur type de GPS est celui qui enregistre la position très fréquemment (toutes les secondes ou deux) et qui a une grande mémoire. Beaucoup de nos cartographes utilisent des GPS de poche Garmin ou des petites unités Bluetooth. Il y a des critiques de GPS détaillés sur notre wiki.\n\nEnvoyer votre piste\nMaintenant vous traiter les données du GPS. Il se peut qu'il vienne avec un logiciel, ou il vous permet de copier les fichiers via USB. Si ce n'est pas le cas, essayez GPSBabel. Quelque soit la manière, les données doivent être au format GPX.\n\nEnsuite utilisez l'onglet « Pistes GPS » pour importer vos pistes sur OpenStreetMap. Mais ceci est uniquement la première partie, cela n'apparaîtra pas encore sur la carte. Vous devez dessiner et nommer les routes vous-même, en utilisant la piste comme guide.\nUtilisation de votre piste\nCherchez vos pistes importées dans la liste « Pistes GPS » et cliquez sur « modifier » juste à côté d'elle. Potlatch démarrera avec cette trace chargée et toutes les balises. Vous êtes prêt à dessiner !\n\nVous pouvez également cliquer sur le bouton pour voir les pistes GPS de tout le monde (mais pas les balises) pour la zone courante. Maintenez Maj pour afficher seulement vos pistes.\nUtilisation de photos satellites\nSi vous n'avez pas de GPS, ne vous inquiétez pas. Pour certaines villes, nous avons des photos satellite sur lesquelles vous pouvez tracer, gentiment fournies par Yahoo! (merci à eux !). Sortez de chez vous et recopiez les noms de rues, puis revenez et tracez-les.\n\nSi vous ne voyez pas l'image satellite, cliquez sur les options et vérifiez que que « Yahoo! » est sélectionné. Si vous ne la voyez toujours pas, elle n'est probablement pas disponible pour votre région, vous devez dézoomer un peu.\n\nDans ces même options vous trouverez quelques autres options comme une carte sans copyright du Royaume-Uni et OpenTopoMap pour les USA. Ils sont tous spécialement sélectionnées car nous sommes autorisés à les utiliser. Ne copiez pas depuis d'autres cartes ou photos aériennes (ceci pour des raisons de droit d'auteur).\n\nIl se peut que les images satellites soient un peu déplacées de l'endroit où les routes sont réellement. Si vous trouvez cela, pressez sur Espace et déplacez l'arrière plan jusqu'à ce qu'il soit au bon endroit. Faites toujours plus confiance aux traces GPS qu'au images satellite.\n\nDessiner des chemins\nPour dessiner une route (ou « chemin ») qui commence dans un espace blanc sur la carte, cliquez sur l'endroit voulu ; ensuite cliquez également sur chaque point de la route. Quand vous avez terminé, faites un double clic ou pressez sur entrée, et finalement cliquez sur un autre endroit pour la dé-selectionner.\n\nPour dessiner un chemin qui commence depuis un autre chemin, cliquez sur le chemin pour le sélectionner ; ses points apparaîtront en rouge. Maintenez Maj et cliquez sur un de ces point pour commencer un autre chemin. (S'il n'y a aucun point rouge à la jonction, faites Maj+clic où vous en désirez un !)\n\nCliquer sur « Sauvegarder » (en bas à droite) quand vous avez fini. Sauvegardez souvent, au cas où le serveur aurait un problème.\n\nVos modifications ne seront pas affichées immédiatement sur la carte principale. Cela prend généralement une heure ou deux et des fois jusqu'à une semaine.\nFaire des jonctions\nIl est très important que quand deux routes se rejoignent, elles partagent un point (ou « nœud »). Les planificateurs d'itinéraires utilisent cela pour savoir où tourner.\n\nPotlatch prend soin de cela tant que vous prêtez attention à cliquer exactement sur la route que vous voulez joindre. Il y a des signes qui vous aident : les point deviennent bleu, les pointeurs changent et quand vous avez fini, le point de jonction aura un contour noir.\nDéplacer et supprimer\nCeci fonctionne comme vous le pensez. Pour supprimer un point, sélectionnez-le et pressez sur Suppr. Pour supprimer une route entière, pressez sur Maj-Suppr.\n\nPour déplacer quelque chose, glissez-le. (Vous devrez cliquez et maintenir un court instant avant de pouvoir glisser une route, comme cela vous ne le ferez pas par accident.)\nDessin plus avancé\nSi deux parties d'un même chemin ont deux noms différents, vous devez le scinder. Pour cela, cliquez sur le chemin, ensuite cliquez sur le point où le chemin doit être scindé et appuyez sur les ciseaux. (Vous pouvez les fusionner en faisant un clic avec Ctrl, ou la touche commande sur un Mac, mais ne fusionnez pas deux chemins de différents types ou qui ont des noms différents.)\n\nLes giratoires sont difficiles à dessiner, mais Potlatch peut vous aider. Dessinez la boucle en gros, et faites attention qu'elle se rejoigne à la fin, ensuite cliquez sur cette icône pour la rendre bien circulaire. (Vous pouvez aussi faire cela sur des routes pour les lisser.)\nPoints d'intérêt\nLa première chose que vous avez appris était comment glisser et dépose un point d'intérêt. Vous pouvez également en créer un en faisant un double clic sur la carte : un cercle vert apparait. Mais comment dire s'il s'agit d'un bar, une église ou autre ? Cliquez sur « Balisage » ci-dessus pour le découvrir !\n\nQuel type de route est-ce ?\nUne fois que vous avez dessiné un chemin, vous devriez dire de quelle sorte de chemin il s'agit. Est-ce une route principale, un sentier ou une rivière ? Quel est son nom ? Y-a-t'il une restriction particulière (par exemple « interdit aux bicyclettes ») ?\n\nSur OpenStreetMap, vous définissez cela en utilisant des « balises ». Une balise contient deux parties, et vous pouvez en avoir autant que vous voulez. Par exemple, vous pouvez ajouter highway | trunk pour dire qu'il s'agit d'une route majeure ; highway | residential pour une route résidentielle ou highway | footway pour un chemin pour piétons. Si les vélos sont interdits, vous pouvez ajouter bicycle | no. Ensuite pour indiquer son nom, ajoutez name | Rue du marché.\n\nLes balises sur Potlatch apparaissent au bas de l'écran : cliquez sur une route et vous verrez ses balises. Cliquez sur le signe « + » (en bas à droite) pour ajouter une nouvelle balise. Le « x » sur chacune d'elle permet de la supprimer.\n\nVous pouvez baliser les chemins entiers ; les points sur les chemins (par exemple un péage ou feu de circulation) et les points d'intérêts.\nUtiliser des balises présélectionnées\nPour débuter, Potlatch contient des réglages prédéfinis avec les balises les plus populaires.\n\nSélectionnez un chemin, ensuite passez en revue les symboles jusqu'à ce que vous en trouvez un convenable. Ensuite choisissez les options les plus appropriées depuis le menu.\n\nCeci remplira les balises. Certaines resterons partiellement vides pour que vous les remplissiez (par exemple) le nom de la rue et le numéro.\nRoutes à sens unique\nVous pourriez avoir envie d'ajouter une balise comme oneway | yes, mais comment dire quelle direction ? Il y a une flèche en bas à gauche qui affiche la direction de la route, du départ à la gauche. Cliquez dessus pour inverser la direction.\nChoisir vos propres balises\nBien sûr, vous n'êtes pas restreint aux balises prédéfinies. En utilisant le bouton « + », vous pouvez définir n'importe quelle balise.\n\nVous pouvez voir les balises que les autres personnes utilisent sur OSMdoc, et il y a une longue liste de balises populaires sur notre wiki nommée « Map Features ». Mais tout ceci est uniquement des suggestion et non des règles. Vous êtes libre d'inventer vos propres balises et d'en piquer d'autres utilisateurs.\n\nEntant donné que les données d'OpenStreetMap sont utilisées pour faire différentes cartes, chacune d'entre elles afficheront leur propre choix de balises.\nRelations\nQuelques fois les balises ne suffisent pas, et vous voudriez « grouper » deux ou plus chemins. Il se peut également qu'il soit interdit de tourner d'une route vers une autre, ou 20 chemins ensemble font un chemin cyclable balisé. Vous pouvez faire cela avec une fonctionnalité avancée nommée « relation ». Plus de détails sur le wiki.\n\nDéfaire des erreurs\nCeci est le bouton annuler (vous pouvez aussi appuyer sur Z) - il annulera votre dernière action.\n\nVous pouvez « révoquer » vers une version précédente d'un chemin ou point. Sélectionnez-le, ensuite cliquez sur son ID (le nombre en bas à gauche) ou pressez sur H (pour « historique »). Vous verrez une liste de toutes les personnes qui l'ont modifié et quand. Choisissez une version à restaurer et cliquez sur révoquer.\n\nSi vous avez accidentellement supprimé un chemin et l'avez sauvegardé, pressez sur U (pour « undelete », restaurer en anglais). Tous les chemins supprimés seront affichés. Choisissez celui que vous voulez, déverouillez-le en cliquant sur le cadenas rouge et sauvegardez comme d'habitude.\n\nVous pensez que quelqu'un d'autre à fait une erreur ? Envoyez-lui un message amical. Utilisez l'historique (H) pour sélectionner son nom et ensuite cliquez sur « Courrier ».\n\nUtilisez l'inspecteur (dans le menu « avancé ») pour des informations utiles à propos du chemin ou du point actuel.\nFAQs\nComment est-ce que je vois mes points tournants?\nLes points tournants apparaissent uniquement si vous cliquez sur « modifier » à côté du nom de la piste depuis « Pistes GPS ». Le fichier doit contient des points tournants et des pistes. Le serveur rejette tout fichier contenant uniquement des points tournant.\n\nPlus de FAQ pour Potlatch et OpenStreetMap.\n\n\n\nTravailler plus vite\nLe moins vous zoomez, plus Potlatch aura de données à charger. Zoomez avant cliquer sur « Modifier ».\n\nDésactivez l'option « Remplacer la souris par le Crayon et la Main » (dans la fenêtre d'options) pour une vitesse maximale.\n\nSi le serveur est lent, revenez plus tard. Vérifiez sur le wiki pour les problèmes connus. Quelques périodes, comme les dimanche soir, sont toujours très chargées.\n\nDites à Potlatch de mémoriser vos groupes de balises préférées. Sélectionnez un chemin ou un point avec ces balises, ensuite pressez sur Ctrl, Maj et un nombre entre 1 et 9. Ensuite, pour les appliquer de nouveau, pressez Maj et ce numéro. (Il seront disponible à chaque fois que vous utilisez Potlatch sur cet ordinateur.)\n\nFaites de votre piste GPS un chemin en le trouvant la liste « Pistes GPS », ensuite en cliquant sur « modifier » à son côté, et finalement en cliquant sur le bouton « convertir ». Il sera verrouillé (rouge) comme cela il ne sera pas sauvegardé. Modifiez-le d'abord, ensuite cliquez sur le cadenas rouge pour le déverrouiller quand vous êtes prêt à sauvegarder.\n\nQue cliquer\nDéplacer la carte pour se déplacer.\nDouble clic pour créer un nouveau POI.\nSimple clic pour débuter un nouveau chemin.\nTenir et déplacer un POI pour le déplacer.\nEn dessinant un chemin\nDouble clic ou appuyer sur entrée pour finir de dessiner.\nClic sur un autre chemin pour faire une jonction.\nMaj+clic la fin d'un autre chemin pour fusionner.\nQuand un chemin est sélectionné\nCliquez sur un point pour le sélectionner.\nMaj+clic sur le chemin pour insérer un nouveau point.\nMaj+clic sur un point pour débuter un nouveau chemin depuis ce point.\nControle-clic sur un autre chemin pour fusionner.\n\nRaccourcis clavier\nB Ajouter une balise de source de l'arrière plan\nC Fermer le groupe de modifications\nG Afficher les traces GPS\nH Afficher l'historique\nI Afficher l'iinspecteur\nJ Joindre le point à un chemin croiseur\n(+Shift) Unjoin from other ways\nK Verrouiller/déverrouiller la sélection actuelle\nL Afficher la latitude/longitude actuelle\nM Maximiser la fenêtre de modification\nP Créer un chemin parallèle\nR Répéter les balises\nS Sauvegarder (sauf si modification en live)\nT Arranger en ligne droite / cercle\nU Restaurer (voir les chemins supprimés)\nX Séparer le chemin en deux\nZ Défaire\n- Supprimer le point de ce chemin seulement\n+ Ajouter une nouvelle balise\n/ Sélectionner un autre chemin partageant ce point\nDelete Supprimer le point\n (+Shift) Supprimer le chemin en entier\nReturn Terminer de dessiner la ligne\nSpace Tenir et déplacer l'arrière plan\nEsc Abandonner la modification ; recharger depuis le serveur\n0 Supprimer toutes les balises\n1-9 Sélectionner les balises présélectionnées\n (+Shift) Sélectionner les balises mémorisées\n (+S/Ctrl) Mémoriser les balises\n§ or ` Boucle entre les groupes de balises\n\n" - hint_drawmode: Clic pour ajouter un point\nDouble-clic/Entrée pour terminer le chemin - hint_latlon: "lat $1\nlon $2" - hint_loading: Chargement des chemins en cours - hint_overendpoint: Sur le dernier point du tracé\nClic pour joindre\nMaj-clic pour fusionner - hint_overpoint: Point du dessus\nCliquer pour joindre - hint_pointselected: Point sélectionné\n(Maj-clic sur le point pour\ncommencer une nouvelle ligne) - hint_saving: sauvegarde des données - hint_saving_loading: Charger/sauvegarder les données - inspector: Inspecteur - inspector_duplicate: Doublon de - inspector_in_ways: Dans les chemins - inspector_latlon: "Lat $1\nLon $2" - inspector_locked: Verrouillé - inspector_node_count: ($1 fois) - inspector_not_in_any_ways: Présent dans aucun chemin (POI) - inspector_unsaved: Non sauvegardé - inspector_uploading: (envoi) - inspector_way: $1 - inspector_way_connects_to: Connecté à $1 chemins - inspector_way_connects_to_principal: Connecte à $1 $2 et $3 autres $4 - inspector_way_name: $1 ($2) - inspector_way_nodes: $1 nœuds - inspector_way_nodes_closed: $1 nœuds (fermé) - loading: Chargement... - login_pwd: "Mot de passe :" - login_retry: Votre nom d'utilisateur du site n'a pas été reconnu. Merci de réessayer. - login_title: Connexion impossible - login_uid: "Nom d’utilisateur :" - mail: Courrier - microblog_name_identica: Identi.ca - microblog_name_twitter: Twitter - more: Plus - newchangeset: "\nMerci de réessayer : Potlatch commencera un nouveau groupe de modifications." - "no": Non - nobackground: Pas d'arrière-plan - norelations: Aucune relation dans l'espace courant - offset_broadcanal: Chemin de halage de canal large - offset_choose: Entrer le décalage (m) - offset_dual: Route à chaussées séparées (D2) - offset_motorway: Autoroute (D3) - offset_narrowcanal: Chemin de halage de canal étroit - ok: Ok - openchangeset: Ouverture d'un changeset - option_custompointers: Remplacer la souris par le Crayon et la Main - option_external: "Lancement externe :" - option_fadebackground: Arrière-plan éclairci - option_layer_cycle_map: OSM - carte cycliste - option_layer_digitalglobe_haiti: "Haïti : DigitalGlobe" - option_layer_geoeye_gravitystorm_haiti: "Haïti : GeoEye 13 janvier" - option_layer_geoeye_nypl_haiti: "Haïti : GeoEye 13 janvier+" - option_layer_maplint: OSM - Maplint (erreurs) - option_layer_mapnik: OSM - Mapnik - option_layer_nearmap: "Australie : NearMap" - option_layer_ooc_25k: "UK historique : 1:25k" - option_layer_ooc_7th: "UK historique : 7e" - option_layer_ooc_npe: "UK historique : NPE" - option_layer_ooc_scotland: "UK historique : Écosse" - option_layer_os_streetview: "UK : OS StreetView" - option_layer_osmarender: OSM - Osmarender - option_layer_streets_haiti: "Haïti: noms des rues" - option_layer_surrey_air_survey: "UK : Relevé aérien du Surrey" - option_layer_tip: Choisir l'arrière-plan à afficher - option_layer_yahoo: Yahoo! - option_limitways: Avertir lors du chargement d'une grande quantité de données - option_microblog_id: "Nom de microblogging :" - option_microblog_pwd: "Mot de passe de microblogging :" - option_noname: Mettre en évidence les routes non nommées - option_photo: "Photo KML :" - option_thinareas: Utiliser des lignes plus fines pour les surfaces - option_thinlines: Utiliser un trait fin à toutes les échelles - option_tiger: Voir les données TIGER non modifiées - option_warnings: Montrer les avertissements flottants - point: Point - preset_icon_airport: Aéroport - preset_icon_bar: Bar - preset_icon_bus_stop: Arrêt de bus - preset_icon_cafe: Café - preset_icon_cinema: Cinéma - preset_icon_convenience: Épicerie - preset_icon_disaster: Dégâts Haïti - preset_icon_fast_food: Restauration rapide - preset_icon_ferry_terminal: Terminal de ferry - preset_icon_fire_station: Caserne de pompiers - preset_icon_hospital: Hôpital - preset_icon_hotel: Hôtel - preset_icon_museum: Musée - preset_icon_parking: Parc de stationnement - preset_icon_pharmacy: Pharmacie - preset_icon_place_of_worship: Lieu de culte - preset_icon_police: Poste de police - preset_icon_post_box: Boîte aux lettres - preset_icon_pub: Pub - preset_icon_recycling: Recyclage - preset_icon_restaurant: Restaurant - preset_icon_school: École - preset_icon_station: Gare - preset_icon_supermarket: Supermarché - preset_icon_taxi: Station de taxis - preset_icon_telephone: Téléphone - preset_icon_theatre: Théâtre - preset_tip: Choisir dans un menu de balises présélectionnées décrivant le $1 - prompt_addtorelation: Ajouter $1 à la relation - prompt_changesetcomment: "Entrez une description de vos modifications :" - prompt_closechangeset: Fermer le groupe de modifications $1 - prompt_createparallel: Créer un chemin parallèle - prompt_editlive: Modifier en direct - prompt_editsave: Modifier avec sauvegarde - prompt_helpavailable: Nouvel utilisateur ? Regardez en bas à gauche pour de l'aide - prompt_launch: Lancer un URL externe - prompt_live: Dans le mode direct, chaque chose que vous modifiez sera sauvegardée instantanément dans la base de données d'OpenStreetMap - ce mode n'est pas recommandé pour les débutants. Êtes-vous certain de vouloir utiliser ce mode ? - prompt_manyways: Cette zone est très détaillée et prendra un long moment pour se charger. Préféreriez-vous zoomer ? - prompt_microblog: Poster sur $1 ($2 restant) - prompt_revertversion: "Revenir à une version sauvegardée antérieure :" - prompt_savechanges: Sauvegarder les modifications - prompt_taggedpoints: Certains points de ce chemin sont associés à des balises ou dans des relations. Voulez-vous vraiment les supprimer ? - prompt_track: Conversion d'une trace GPS en chemin (verrouillé) pour l'édition - prompt_unlock: Cliquer pour déverrouiller - prompt_welcome: Bienvenue sur OpenStreetMap ! - retry: Réessayer - revert: Révoquer - save: Sauvegarder - tags_backtolist: Retour à la liste - tags_descriptions: Descriptions de « $1 » - tags_findatag: Rechercher une balise - tags_findtag: Rechercher balise - tags_matching: Balises populaires correspondant à « $1 » - tags_typesearchterm: "Tapez le mot à rechercher :" - tip_addrelation: Ajouter à une relation - tip_addtag: Ajouter une nouvelle balise - tip_alert: Une erreur est survenue - Cliquez pour plus de détails - tip_anticlockwise: Circulation dans le sens inverse des aiguilles d'une montre (trigonométrique) - Cliquez pour inverser le sens - tip_clockwise: Circulation dans le sens des aiguilles d'une montre - Cliquez pour inverser le sens - tip_direction: Direction du chemin - Cliquez pour inverser - tip_gps: Afficher les traces GPS (G) - tip_noundo: Rien à annuler - tip_options: Options (choix de la carte d'arrière plan) - tip_photo: Charger des photos - tip_presettype: Sélectionner le type de paramètres proposés dans le menu de sélection. - tip_repeattag: Recopier les balises du chemin sélectionné précédemment (R) - tip_revertversion: Choisissez la version vers laquelle revenir - tip_selectrelation: Ajouter à la route choisie - tip_splitway: Scinder le chemin au point sélectionné (X) - tip_tidy: Lisser les points du chemin (T) - tip_undo: Annuler l'opération $1 (Z) - uploading: Envoi... - uploading_deleting_pois: Supression des POI - uploading_deleting_ways: Suppression de chemins - uploading_poi: Envoi du POI $1 - uploading_poi_name: Envoi du POI $1, $2 - uploading_relation: Envoi de la relation $1 - uploading_relation_name: Envoi de la relation $1, $2 - uploading_way: Envoi du chemin $1 - uploading_way_name: Envoi du chemin $1, $2 - warning: Attention ! - way: Chemin - "yes": Oui diff --git a/config/potlatch/locales/gl.yml b/config/potlatch/locales/gl.yml deleted file mode 100644 index af7e58b10..000000000 --- a/config/potlatch/locales/gl.yml +++ /dev/null @@ -1,229 +0,0 @@ -# Messages for Galician (Galego) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Toliño -gl: - a_poi: $1 un punto de interese - a_way: $1 un camiño - action_addpoint: o engadido dun nodo ao final dun camiño - action_cancelchanges: a cancelación dos cambios feitos a - action_changeway: os cambios feitos a un camiño - action_createparallel: a creación de camiños paralelos - action_createpoi: a creación dun punto de interese - action_deletepoint: o borrado dun punto - action_insertnode: o engadido dun nodo a un camiño - action_mergeways: a fusión de dous camiños - action_movepoi: o movemento dun punto de interese - action_movepoint: o movemento dun punto - action_moveway: o movemento dun camiño - action_pointtags: a definición das etiquetas nun punto - action_poitags: a definición das etiquetas nun punto de interese - action_reverseway: a inversión dun camiño - action_revertway: a reversión dun camiño - action_splitway: a división dun camiño - action_waytags: a definición das etiquetas nun camiño - advanced: Avanzado - advanced_close: Pechar o conxunto de cambios - advanced_history: Historial do camiño - advanced_inspector: Inspector - advanced_maximise: Maximizar a ventá - advanced_minimise: Minimizar a ventá - advanced_parallel: Camiño paralelo - advanced_tooltip: Accións de edición avanzadas - advanced_undelete: Restaurar - advice_bendy: Demasiado curvado para podelo endereitar (Bloq. Maiús. para forzar) - advice_conflict: Conflito co servidor; poida que necesite intentar gardar de novo - advice_deletingpoi: Borrando o punto de interese (Z para desfacer) - advice_deletingway: Borrando o camiño (Z para desfacer) - advice_microblogged: Actualizouse o teu estado en $1 - advice_nocommonpoint: Os camiños non teñen ningún punto en común - advice_revertingpoi: Revertendo ata o último punto de interese gardado (Z para desfacer) - advice_revertingway: Revertendo ata o último camiño gardado (Z para desfacer) - advice_tagconflict: As etiquetas non coinciden, compróbeas (Z para desfacer) - advice_toolong: Demasiado longo para desbloquear (por favor, divídao en camiños máis curtos) - advice_uploadempty: Nada que cargar - advice_uploadfail: Carga detida - advice_uploadsuccess: Cargáronse correctamente todos os datos - advice_waydragged: Camiño arrastrado (Z para desfacer) - cancel: Cancelar - closechangeset: Pechando o conxunto de cambios - conflict_download: Descargar a súa versión - conflict_overwrite: Sobrescribir a súa versión - conflict_poichanged: Des que comezou a editar, alguén cambiou o punto $1$2. - conflict_relchanged: Des que comezou a editar, alguén cambiou a relación $1$2. - conflict_visitpoi: Prema en "OK" para mostrar o punto. - conflict_visitway: Prema en "OK" para mostrar o camiño. - conflict_waychanged: Des que comezou a editar, alguén cambiou o camiño $1$2. - createrelation: Crear unha nova relación - custom: "Personalizado:" - delete: Borrar - deleting: borrando - drag_pois: Arrastrar e soltar puntos de interese - editinglive: Edición en vivo - editingoffline: Edición sen conexión - emailauthor: \n\nPor favor, envíe un correo electrónico a richard\@systemeD.net cun informe de erros, explicando o que estaba a facer no momento no que se produciu. - error_anonymous: Non se pode pór en contacto cun mapeador anónimo. - error_connectionfailed: Sentímolo!, fallou a conexión ao servidor do OpenStreetMap. Non se gardou ningunha das modificacións recentes.\n\nQuéreo intentar de novo? - error_microblog_long: "Fallou a publicación en $1:\nCódigo HTTP: $2\nMensaxe de erro: $3\nErro de $1: $4" - error_nopoi: Non se puido atopar o punto de interese (se cadra está noutra zona?), por iso non se pode desfacer. - error_nosharedpoint: Os camiños $1 e $2 non teñen un punto en común, por iso non pode desfacer a división. - error_noway: Non se puido atopar o camiño $1 (se cadra está noutra zona?), por iso non se pode desfacer. - error_readfailed: Sentímolo!, o servidor do OpenStreetMap non respondeu á petición de datos.\n\nQuéreo intentar de novo? - existingrelation: Engadir a unha relación existente - findrelation: Atopar unha relación que conteña - gpxpleasewait: Por favor, agarde mentres se procesa a pista GPX. - heading_drawing: Deseño - heading_introduction: Introdución - heading_pois: Primeiros pasos - heading_quickref: Referencia rápida - heading_surveying: Topografía - heading_tagging: Etiquetado - heading_troubleshooting: Resolución de problemas - help: Axuda - help_html: "Benvido ao Potlatch\nO Potlatch é o editor fácil de usar para o OpenStreetMap. Debuxe estradas, camiños, puntos turísticos e tendas a partir das súas pescudas GPS, imaxes de satélite ou mapas antigos.\n\nEstas páxinas hanlle axudar a aprender os fundamentos básicos do uso do Potlatch, así como dicirlle onde pode atopar máis información. Prema sobre as cabeceiras que hai enriba para comezar.\n\nCando remate, basta con premer en calquera outro lugar da páxina.\n\n\n\nCousas útiles que debe saber\nNon copie doutros mapas!\n\nSe escolle \"Editar en vivo\", todas as mudanzas que faga gardaranse na base de datos ao mesmo tempo que vai debuxando, é dicir, inmediatamente. Se aínda non ten confianza abonda na edición escolla \"Editar con gardado\", e os cambios só se rexistrarán en canto prema sobre \"Gardar\".\n\nO máis habitual é que todas as edicións que faga aparezan no mapa unha ou dúas horas despois da edición (algunhas poucas cousas necesitan unha semana). Aínda así, non se mostra todo no mapa; quedaría moi confuso. Xa que os datos do OpenStreetMap son de código aberto, calquera persoa é libre de facer mapas de diferentes aspectos, como o OpenCycleMap ou o Midnight Commander.\n\nLembre que se trata ao mesmo tempo dun mapa cunha boa aparencia (debuxe curvas suaves para os xiros) e dun diagrama (asegúrese de que as estradas se unan nos cruces).\n\nXa dixemos que non se debe copiar doutros mapas?\n\n\nMáis información\nManual do Potlatch\nListas de correo\nConversa en liña (axuda en directo)\nForo web\nWiki da comunidade\nCódigo fonte do Potlatch\n\n\n\nPrimeiros pasos\nAgora que xa ten o Potlatch aberto, faga clic en \"Editar con gardado\" para comezar.\n\nEntón, xa está listo para deseñar un mapa. O mellor xeito de comezar é poñer algúns puntos de interese no mapa. Estes poden ser bares, igrexas, estacións de tren... calquera cousa que lle guste.\n\nArrastrar e soltar\nPara facelo moi sinxelo, pode ollar unha selección dos puntos de interese máis comúns na parte inferior dereita do mapa. Para poñer un no mapa, é tan fácil como arrastralo desde alí ata o lugar correcto no mapa. E non se preocupe se non dá coa posición boa á primeira: pode arrastralo de novo ata que acerte. Note que o punto de interese está destacado en amarelo para mostrar que está seleccionado.\n\nUnha vez feito isto, terá que lle dar un nome ao seu bar (ou igrexa, ou estación). Verá aparecer unha pequena táboa ao pé. Unha das entradas porá \"nome\", seguida de \"(escriba o nome aquí)\". Fágao: prema sobre o texto e escriba o nome.\n\nPrema en calquera outro lugar do mapa para desmarcar o seu punto de interese, e o pequeno panel de cor volverá.\n\nDoado, non é? Prema sobre \"Gardar\" (abaixo á dereita) cando remate.\nÁs voltas\nTo move to a different part of the map, just drag an empty area. Potlatch will automatically load the new data (look at the top right).\n\nWe told you to 'Edit with save', but you can also click 'Edit live'. If you do this, your changes will go into the database straightaway, so there's no 'Save' button. This is good for quick changes and mapping parties.\n\nSeguintes pasos\nHappy with all of that? Great. Click 'Surveying' above to find out how to become a real mapper!\n\nSurveying with a GPS\nThe idea behind OpenStreetMap is to make a map without the restrictive copyright of other maps. This means you can't copy from elsewhere: you must go and survey the streets yourself. Fortunately, it's lots of fun!\nThe best way to do this is with a handheld GPS set. Find an area that isn't mapped yet, then walk or cycle up the streets with your GPS switched on. Note the street names, and anything else interesting (pubs? churches?) , as you go along.\n\nWhen you get home, your GPS will contain a 'tracklog' recording everywhere you've been. You can then upload this to OpenStreetMap.\n\nThe best type of GPS is one that records to the tracklog frequently (every second or two) and has a big memory. Lots of our mappers use handheld Garmins or little Bluetooth units. There are detailed GPS Reviews on our wiki.\n\nCarga da súa pista\nNow, you need to get your track off the GPS set. Maybe your GPS came with some software, or maybe it lets you copy the files off via USB. If not, try GPSBabel. Whatever, you want the file to be in GPX format.\n\nThen use the 'GPS Traces' tab to upload your track to OpenStreetMap. But this is only the first bit - it won't appear on the map yet. You must draw and name the roads yourself, using the track as a guide.\nUso da súa pista\nFind your uploaded track in the 'GPS Traces' listing, and click 'edit' right next to it. Potlatch will start with this track loaded, plus any waypoints. You're ready to draw!\n\nYou can also click this button to show everyone's GPS tracks (but not waypoints) for the current area. Hold Shift to show just your tracks.\nUso de fotos de satélite\nIf you don't have a GPS, don't worry. In some cities, we have satellite photos you can trace over, kindly supplied by Yahoo! (thanks!). Go out and note the street names, then come back and trace over the lines.\n\nIf you don't see the satellite imagery, click the options button and make sure 'Yahoo!' is selected. If you still don't see it, it's probably not available for your city, or you might need to zoom out a bit.\n\nOn this same options button you'll find a few other choices like an out-of-copyright map of the UK, and OpenTopoMap for the US. These are all specially selected because we're allowed to use them - don't copy from anyone else's maps or aerial photos. (Copyright law sucks.)\n\nSometimes satellite pics are a bit displaced from where the roads really are. If you find this, hold Space and drag the background until it lines up. Always trust GPS tracks over satellite pics.\n\nDebuxar camiños\nTo draw a road (or 'way') starting at a blank space on the map, just click there; then at each point on the road in turn. When you've finished, double-click or press Enter - then click somewhere else to deselect the road.\n\nTo draw a way starting from another way, click that road to select it; its points will appear red. Hold Shift and click one of them to start a new way at that point. (If there's no red point at the junction, shift-click where you want one!)\n\nClick 'Save' (bottom right) when you're done. Save often, in case the server has problems.\n\nDon't expect your changes to show instantly on the main map. It usually takes an hour or two, sometimes up to a week.\nFacer cruces\nIt's really important that, where two roads join, they share a point (or 'node'). Route-planners use this to know where to turn.\n\nPotlatch takes care of this as long as you are careful to click exactly on the way you're joining. Look for the helpful signs: the points light up blue, the pointer changes, and when you're done, the junction point has a black outline.\nMover e borrar\nThis works just as you'd expect it to. To delete a point, select it and press Delete. To delete a whole way, press Shift-Delete.\n\nTo move something, just drag it. (You'll have to click and hold for a short while before dragging a way, so you don't do it by accident.)\nDebuxo máis avanzado\nIf two parts of a way have different names, you'll need to split them. Click the way; then click the point where it should be split, and click the scissors. (You can merge ways by clicking with Control, or the Apple key on a Mac, but don't merge two roads of different names or types.)\n\nRoundabouts are really hard to draw right. Don't worry - Potlatch can help. Just draw the loop roughly, making sure it joins back on itself at the end, then click this icon to 'tidy' it. (You can also use this to straighten out roads.)\nPuntos de interese\nThe first thing you learned was how to drag-and-drop a point of interest. You can also create one by double-clicking on the map: a green circle appears. But how to say whether it's a pub, a church or what? Click 'Tagging' above to find out!\n\nQue tipo de estrada é esta?\nOnce you've drawn a way, you should say what it is. Is it a major road, a footpath or a river? What's its name? Are there any special rules (e.g. \"no bicycles\")?\n\nIn OpenStreetMap, you record this using 'tags'. A tag has two parts, and you can have as many as you like. For example, you could add highway | trunk to say it's a major road; highway | residential for a road on a housing estate; or highway | footway for a footpath. If bikes were banned, you could then add bicycle | no. Then to record its name, add name | Market Street.\n\nThe tags in Potlatch appear at the bottom of the screen - click an existing road, and you'll see what tags it has. Click the '+' sign (bottom right) to add a new tag. The 'x' by each tag deletes it.\n\nYou can tag whole ways; points in ways (maybe a gate or a traffic light); and points of interest.\nUso de etiquetas preestablecidas\nTo get you started, Potlatch has ready-made presets containing the most popular tags.\n\nSelect a way, then click through the symbols until you find a suitable one. Then, choose the most appropriate option from the menu.\n\nThis will fill the tags in. Some will be left partly blank so you can type in (for example) the road name and number.\nEstradas dun só sentido\nYou might want to add a tag like oneway | yes - but how do you say which direction? There's an arrow in the bottom left that shows the way's direction, from start to end. Click it to reverse.\nElección das súas propias etiquetas\nOf course, you're not restricted to just the presets. By using the '+' button, you can use any tags at all.\n\nYou can see what tags other people use at OSMdoc, and there is a long list of popular tags on our wiki called Map Features. But these are only suggestions, not rules. You are free to invent your own tags or borrow from others.\n\nBecause OpenStreetMap data is used to make many different maps, each map will show (or 'render') its own choice of tags.\nRelacións\nSometimes tags aren't enough, and you need to 'group' two or more ways. Maybe a turn is banned from one road into another, or 20 ways together make up a signed cycle route. You can do this with an advanced feature called 'relations'. Find out more on the wiki.\n\nDesfacer os erros\nEste é o botón para desfacer (tamén pode premer sobre Z). Con el poderá anular a última cousa que fixo.\n\nYou can 'revert' to a previously saved version of a way or point. Select it, then click its ID (the number at the bottom left) - or press H (for 'history'). You'll see a list of everyone who's edited it, and when. Choose the one to go back to, and click Revert.\n\nIf you've accidentally deleted a way and saved it, press U (for 'undelete'). All the deleted ways will be shown. Choose the one you want; unlock it by clicking the red padlock; and save as usual.\n\nThink someone else has made a mistake? Send them a friendly message. Use the history option (H) to select their name, then click 'Mail'.\n\nUse the Inspector (in the 'Advanced' menu) for helpful information about the current way or point.\nPreguntas máis frecuentes\nHow do I see my waypoints?\nWaypoints only show up if you click 'edit' by the track name in 'GPS Traces'. The file has to have both waypoints and tracklog in it - the server rejects anything with waypoints alone.\n\nMore FAQs for Potlatch and OpenStreetMap.\n\n\n\nTraballar máis rápido\nThe further out you're zoomed, the more data Potlatch has to load. Zoom in before clicking 'Edit'.\n\nTurn off 'Use pen and hand pointers' (in the options window) for maximum speed.\n\nIf the server is running slowly, come back later. Check the wiki for known problems. Some times, like Sunday evenings, are always busy.\n\nTell Potlatch to memorise your favourite sets of tags. Select a way or point with those tags, then press Ctrl, Shift and a number from 1 to 9. Then, to apply those tags again, just press Shift and that number. (They'll be remembered every time you use Potlatch on this computer.)\n\nTurn your GPS track into a way by finding it in the 'GPS Traces' list, clicking 'edit' by it, then tick the 'convert' box. It'll be locked (red) so won't save. Edit it first, then click the red padlock to unlock when ready to save.\n\nQue premer\nArrastre o mapa para moverse.\nDobre clic para crear un novo punto de interese.\nUn clic para iniciar un novo camiño.\nManteña e arrastre un camiño ou punto de interese para movelo.\nAo debuxar un camiño\nDobre clic ou prema a tecla Intro para finalizar o debuxo.\nPrema sobre outro camiño para facer un cruce.\nPrema Shift ao final doutro camiño para fusionar.\nAo seleccionar un camiño\nPrema nun punto para seleccionalo.\nPrema Shift no camiño para introducir un novo punto.\nPrema Shift nun punto para comezar un novo camiño desde alí.\nPrema Control noutro camiño para fusionar.\n\nAtallos do teclado\nB: Engadir unha etiqueta de fonte de fondo\nC: Pechar o conxunto de cambios\nG: Mostrar as pistas GPS\nH: Mostrar o historial\nI: Mostrar o inspector\nJ: Unir o punto cun cruce de camiños\n(+Shift) Unjoin from other ways\nK: Bloquear ou desbloquear a selección\nL: Mostrar a latitude e lonxitude actuais\nM: Maximizar a ventá de edición\nP: Crear un camiño paralelo\nR: Repetir as etiquetas\nS: Gardar (agás se se está a empregar a edición en vivo)\nT: Arrombar en liña recta ou círculo\nU: Restaurar (mostrar os camiños borrados)\nX: Dividir o camiño en dous\nZ: Desfacer\n-: Eliminar o punto soamente deste camiño\n+: Engadir unha nova etiqueta\n/: Seleccionar outro camiño que comparta este punto\nDelete: Borrar o punto\n (+Shift): Borrar o camiño enteiro\nReturn: Rematar o debuxo da liña\nSpace: Manter e arrastrar o fondo\nEsc: Cancelar a edición; recargar desde o servidor\n0: Eliminar todas as etiquetas\n1-9: Seleccionar as etiquetas preestablecidas\n (+Shift): Seleccionar as etiquetas memorizadas\n (+S/Ctrl): Memorizar as etiquetas\n§ ou `: Rotar entre grupos de etiquetas\n\n" - hint_drawmode: un clic para engadir un punto\ndobre clic/Intro\npara rematar a liña - hint_latlon: "lat $1\nlon $2" - hint_loading: cargando os datos - hint_overendpoint: sobre o punto de fin ($1)\nprema para unir\nfaga clic no Bloq. Maiús. para fusionar - hint_overpoint: punto superior ($1)\nprema para unir - hint_pointselected: punto seleccionado\n(faga clic no Bloq. Maiús. no punto para\ncomezar unha nova liña) - hint_saving: gardando os datos - hint_saving_loading: cargando/gardando os datos - inspector: Inspector - inspector_duplicate: Duplicado de - inspector_in_ways: Nos camiños - inspector_latlon: "Lat $1\nLon $2" - inspector_locked: Pechado - inspector_node_count: ($1 veces) - inspector_not_in_any_ways: Non está en ningún camiño (punto de interese) - inspector_unsaved: Sen gardar - inspector_uploading: (cargando) - inspector_way_connects_to: Conecta con $1 camiños - inspector_way_connects_to_principal: Conecta con $1 $2 e $3 $4 - inspector_way_nodes: $1 nodos - inspector_way_nodes_closed: $1 nodos (pechado) - loading: Cargando... - login_pwd: "Contrasinal:" - login_retry: Non se recoñeceu o seu nome de usuario. Por favor, inténteo de novo. - login_title: Non se puido rexistrar - login_uid: "Nome de usuario:" - mail: Correo - more: Máis - newchangeset: "\nPor favor, inténteo de novo: o Potlatch comezará un novo conxunto de cambios." - "no": Non - nobackground: Sen fondo - norelations: Non existen relacións na zona actual - offset_broadcanal: Camiño de sirga ancho - offset_choose: Elixa o desprazamento (m) - offset_dual: Autovía (D2) - offset_motorway: Autoestrada (D3) - offset_narrowcanal: Camiño de sirga estreito - ok: OK - openchangeset: Abrindo o conxunto de cambios - option_custompointers: Usar os punteiros de pluma e man - option_external: "Lanzamento externo:" - option_fadebackground: Atenuar o fondo - option_layer_cycle_map: OSM - mapa cíclico - option_layer_maplint: OSM - Maplint (erros) - option_layer_nearmap: "Australia: NearMap" - option_layer_ooc_25k: "Reino Unido histórico: 1:25k" - option_layer_ooc_7th: "Reino Unido histórico: 7º" - option_layer_ooc_npe: "Reino Unido histórico: NPE" - option_layer_ooc_scotland: "Reino Unido histórico: Escocia" - option_layer_os_streetview: "Reino Unido: OS StreetView" - option_layer_streets_haiti: "Haití: nomes de rúas" - option_layer_surrey_air_survey: "Reino Unido: Inspección aérea de Surrey" - option_layer_tip: Escolla o fondo a mostrar - option_limitways: Avisar ao cargar moitos datos - option_microblog_id: "Nome do blogue de mensaxes curtas:" - option_microblog_pwd: "Contrasinal do blogue de mensaxes curtas:" - option_noname: Destacar as estradas sen nome - option_photo: "Foto KML:" - option_thinareas: Empregar liñas máis finas para as zonas - option_thinlines: Empregar liñas finas en todas as escalas - option_tiger: Destacar os datos TIGER non modificados - option_warnings: Mostrar os avisos flotantes - point: Punto - preset_icon_airport: Aeroporto - preset_icon_bar: Bar - preset_icon_bus_stop: Parada de autobús - preset_icon_cafe: Cafetaría - preset_icon_cinema: Sala de cine - preset_icon_convenience: Tenda - preset_icon_disaster: Construción en Haití - preset_icon_fast_food: Comida rápida - preset_icon_ferry_terminal: Terminal de transbordador - preset_icon_fire_station: Parque de bombeiros - preset_icon_hospital: Hospital - preset_icon_hotel: Hotel - preset_icon_museum: Museo - preset_icon_parking: Aparcadoiro - preset_icon_pharmacy: Farmacia - preset_icon_place_of_worship: Lugar de culto - preset_icon_police: Comisaría de policía - preset_icon_post_box: Caixa de correo - preset_icon_pub: Pub - preset_icon_recycling: Reciclaxe - preset_icon_restaurant: Restaurante - preset_icon_school: Escola - preset_icon_station: Estación de ferrocarril - preset_icon_supermarket: Supermercado - preset_icon_taxi: Estación de taxis - preset_icon_telephone: Teléfono - preset_icon_theatre: Teatro - preset_tip: Escolla dun menú de etiquetas predefinidas que describan o $1 - prompt_addtorelation: Engadir un $1 á relación - prompt_changesetcomment: "Insira unha descrición dos seus cambios:" - prompt_closechangeset: Pechar o conxunto de cambios $1 - prompt_createparallel: Crear un camiño paralelo - prompt_editlive: Editar en vivo - prompt_editsave: Editar con gardado - prompt_helpavailable: É un usuario novo? Olle o canto inferior esquerdo para obter axuda. - prompt_launch: Lanzar un URL externo - prompt_live: No modo en directo, cada elemento que cambie gardarase instantaneamente na base de datos do OpenStreetMap; non se recomenda para os principiantes. Está seguro de querer usar este modo? - prompt_manyways: Esta zona é moi detallada e vai levar moito tempo cargala. Quere achegarse co zoom? - prompt_microblog: Publicar en $1 ($2 restantes) - prompt_revertversion: "Volver a unha versión anterior:" - prompt_savechanges: Gardar os cambios - prompt_taggedpoints: Algúns dos puntos deste camiño están etiquetados ou en relacións. Realmente os quere borrar? - prompt_track: Converter as pistas GPS en camiños - prompt_unlock: Prema para desbloquear - prompt_welcome: Benvido ao OpenStreetMap! - retry: Reintentar - revert: Reverter - save: Gardar - tags_backtolist: Volver á lista - tags_descriptions: Descricións de "$1" - tags_findatag: Atopar unha etiqueta - tags_findtag: Atopar unha etiqueta - tags_matching: Etiquetas populares que coinciden con "$1" - tags_typesearchterm: "Escriba unha palabra a procurar:" - tip_addrelation: Engadir a unha relación - tip_addtag: Engadir unha nova etiqueta - tip_alert: Houbo un erro (prema para obter máis detalles) - tip_anticlockwise: Camiño circular no sentido contrario ao das agullas do reloxo (prema para inverter) - tip_clockwise: Camiño circular no sentido das agullas do reloxo (prema para inverter) - tip_direction: Dirección do camiño (prema para invertela) - tip_gps: Mostrar as pistas GPS (G) - tip_noundo: Nada que desfacer - tip_options: Definir as opcións (escolla o fondo do mapa) - tip_photo: Cargar fotos - tip_presettype: Escolla o tipo de preaxustes ofrecidos no menú. - tip_repeattag: Repetir as informacións do camiño seleccionado anteriormente (R) - tip_revertversion: Escolla a data á que reverter - tip_selectrelation: Engadir ao percorrido elixido - tip_splitway: Dividir o camiño nos puntos seleccionados (X) - tip_tidy: Ordenar os puntos do camiño (T) - tip_undo: Desfacer $1 (Z) - uploading: Cargando... - uploading_deleting_pois: Borrando os puntos de interese - uploading_deleting_ways: Borrando os camiños - uploading_poi: Cargando o punto de interese $1 - uploading_poi_name: Cargando o punto de interese $1, $2 - uploading_relation: Cargando a relación $1 - uploading_relation_name: Cargando a relación $1, $2 - uploading_way: Cargando o camiño $1 - uploading_way_name: Cargando o camiño $1, $2 - warning: Atención! - way: Camiño - "yes": Si diff --git a/config/potlatch/locales/he.yml b/config/potlatch/locales/he.yml deleted file mode 100644 index e6a346941..000000000 --- a/config/potlatch/locales/he.yml +++ /dev/null @@ -1,100 +0,0 @@ -# Messages for Hebrew (עברית) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: YaronSh -he: - a_poi: $1 נקודת העניין - a_way: $1 הדרך - action_cancelchanges: ביטול השינויים שבוצעו על - action_changeway: שינויים לדרך - action_createparallel: יצירת דרכים מקבילות - action_createpoi: יצירת נקודת עניין - action_deletepoint: מחיקת נקודה - action_insertnode: הוספת צומת לדרך - action_mergeways: מיזוג שתי דרכים - action_movepoi: הזזת נקודת עניין - action_movepoint: העברת נקודה - action_moveway: העברת דרך - action_pointtags: הגדרת תגיות לנקודה - action_poitags: הגדרת תגיות לנקודת עניין - action_splitway: פיצול דרך - action_waytags: הגדרת תגיות לדרך - advanced: מתקדם - advanced_history: היסטוריית הדרך - advanced_inspector: חוקר - advanced_maximise: הגדלת החלון - advanced_minimise: מזעור החלון - advanced_parallel: דרך מקבילית - advanced_undelete: ביטול מחיקה - advice_deletingpoi: מתבצעת מחיקת נקודת העניין (Z לביטול) - advice_uploadempty: אין מה לשלוח - advice_uploadfail: השליחה נעצרה - advice_uploadsuccess: כל הנתונים נשלחו בהצלחה - advice_waydragged: הדרך נגררה (Z לביטול) - cancel: ביטול - conflict_download: הורדת הגרסה שלהם - conflict_poichanged: מאז תחילת העריכה, מישהו אחר שינה את הנקודה $1$2. - conflict_visitpoi: יש ללחוץ על 'אישור' כדי להציג את הנקודה. - conflict_visitway: יש ללחוץ על 'אישור' כדי להציג את הדרך. - createrelation: יצירת קשר חדש - delete: מחיקת - deleting: מחיקה - editinglive: עריכה חיה - editingoffline: עריכה לא מקוונת - error_nopoi: לא ניתן למצוא את נקודת העניין (יכול להיות שסטית מהמיקום?) לכן לא ניתן לבטל. - error_nosharedpoint: הדרכים $1 ו־$2 אינן חולקות נקודה משותפת עוד, לכן לא ניתן לבטל את הפיצול. - existingrelation: הוספה לקשר קיים - findrelation: מציאת קשר המכיל - heading_drawing: ציור - heading_introduction: הקדמה - heading_pois: מתחילים - heading_quickref: הפניה מהירה - heading_surveying: תשאול - heading_tagging: תיוג - heading_troubleshooting: פתרון בעיות - help: עזרה - hint_overpoint: נקודה חופפת ($1)\nלחצו לצירוף - hint_saving: הנתונים נשמרים - hint_saving_loading: טעינת/שמירת נתונים - login_pwd: סיסמה - login_title: לא ניתן להכנס - login_uid: "שם משתמש:" - mail: דואר - more: עוד - nobackground: ללא רקע - offset_choose: בחירת קיזוז (מ') - ok: אישור - option_external: "טעינה חיצונית:" - option_fadebackground: רקע דהוי - option_noname: סימון דרכים ללא שם - option_photo: "ה־KML של התמונה:" - option_thinareas: שימוש בקווים דקים יותר עבור אזורים - option_thinlines: שימוש בקווים דקים בכל קנה מידה - option_warnings: הצגת אזהרות צפות - point: נקודה - prompt_addtorelation: הוספת $1 לקשר - prompt_changesetcomment: "תארו את השינויים שביצעתם:" - prompt_createparallel: יצירת דרך מקבילית - prompt_editsave: עריכה עם שמירה - prompt_helpavailable: משתמשים חדשים? הביטו בפינה השמאלית התחתונה לקבלת עזרה. - prompt_launch: טעינת כתובת חיצונית - prompt_revertversion: "חזרה לגרסה שנשמרה קודם לכן:" - prompt_savechanges: שמירת השינוים - prompt_welcome: ברוכים הבאים ל־OpenStreetMap! - retry: נסיון חוזר - revert: החזרה - save: שמירה - tip_addrelation: הוספה לקשר - tip_addtag: הוספת תגית חדשה - tip_alert: ארעה שגיאה - לחצו לפרטים - tip_clockwise: דרך מעגלית עם כיוון השעון - לחיצה להיפוך - tip_direction: כיוון התנועה בדרך - לחיצה להיפוך - tip_gps: הצגת עקבות GPS (G) - tip_noundo: אין מה לבטל - tip_options: הגדרת אפשרויות (בחירת רקע המפה) - tip_photo: טעינת תמונות - tip_selectrelation: הוספה למסלול הנבחר - tip_splitway: פיצול דרך בנקודה הנבחרת (X) - tip_undo: ביטול $1 (Z) - uploading: בהליכי העלאה... - way: דרך diff --git a/config/potlatch/locales/hr.yml b/config/potlatch/locales/hr.yml deleted file mode 100644 index 871bdb081..000000000 --- a/config/potlatch/locales/hr.yml +++ /dev/null @@ -1,230 +0,0 @@ -# Messages for Croatian (Hrvatski) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Mvrban -# Author: SpeedyGonsales -hr: - a_poi: $1 POI (točka interesa) - a_way: $1 put - action_addpoint: dodavanje točke na kraj puta - action_cancelchanges: poništavanje promjena - action_changeway: promjene na putu - action_createparallel: stvaranje paralelnog puta - action_createpoi: Stvaranje POI - action_deletepoint: brišem točku - action_insertnode: dodavanje točke na put - action_mergeways: spajanje dva puta - action_movepoi: premještanje POI - action_movepoint: premještanje točke - action_moveway: pomicanje puta - action_pointtags: Stavljanje oznaka (Tags) na točku - action_poitags: stavljam tagove na POI - action_reverseway: obrćem put - action_revertway: vraćanje puta na staro - action_splitway: podjela puta - action_waytags: namjesti oznake (Tags) na put - advanced: Napredno - advanced_close: Zatvori changeset - advanced_history: Povijest puta - advanced_inspector: Inspector - advanced_maximise: Maksimiziraj prozor - advanced_minimise: Minimiziraj prozor - advanced_parallel: Paralelni put - advanced_tooltip: Napredne uređivačke akcije - advanced_undelete: Vrati obrisano - advice_bendy: Previše zavojito za izravnavanje (SHIFT za nasilno) - advice_conflict: Konflikt na serveru - možda ćete morati ponovno pokušati spremiti - advice_deletingpoi: Brisanje POI (Z - poništi) - advice_deletingway: Brisanje puta (poništi sa Z) - advice_microblogged: $1 status je ažuriran - advice_nocommonpoint: Putevi ne dijele zajedničku točku - advice_revertingpoi: Vraćam nazad na zadnje spremljeno POI (poništi sa Z) - advice_revertingway: Vraćanje na zadnji spremljeni put (Z za poništavanje) - advice_tagconflict: Oznake nisu jednake - molim provjeriti (poništi sa Z) - advice_toolong: Predugačko za otključavanje - molim podijeli put u kraće puteve. - advice_uploadempty: Ništa za spremanje - advice_uploadfail: Upload zaustavljen - advice_uploadsuccess: Svi podaci su uspješno spremljeni - advice_waydragged: Put povučen (poništi sa Z) - cancel: Poništi - closechangeset: Zatvaranje changeset-a - conflict_download: Preuzmi njihovu verziju - conflict_overwrite: Prepiši njihovu verziju - conflict_poichanged: Otkada si počeo uređivati, netko drugi je promjenio točku $1$2. - conflict_relchanged: Otkad si počeo uređivati, netko je promjenio relaciju $1$2. - conflict_visitpoi: Klik 'OK' za prikaz točke - conflict_visitway: Klikni 'Ok' za prikaz puta. - conflict_waychanged: Otkad ste počeli uređivati, netko drugi je promjenio put $1$2. - createrelation: Napravi novu relaciju - custom: "Custom:" - delete: Briši - deleting: brišem - drag_pois: Povuci i ispusti POI - editinglive: Uređujete uživo - editingoffline: Uređujete offline - emailauthor: \n\nMolim pošalji e-mail richard\@systemeD.net sa izvješćem o bug-u, recite što ste radili u to vrijeme. - error_anonymous: Ne možete kontaktirati anonimnog mappera. - error_connectionfailed: Žao mi je, veza sa OpenstreetMap serverom nije uspjela. Neke nedavne promjene nisu spremljene.\n\nŽelite li pokušati ponovno? - error_microblog_long: "Slanje na $1 nije uspjelo:\nHTTP kod pogreške: $2\nTekst pogreške: $3\n$1 pogreška: $4" - error_nopoi: POI se ne može naći (možda ste pomakli kartu), tako da ne mogu poništiti. - error_nosharedpoint: Putevi $1 i $2 više ne dijele zajedničku točku, pa se ne mogu razdvojiti. - error_noway: Put $1 se ne može pronaći (možda ste pomakli kartu?), pa ne mogu poništiti. - error_readfailed: Žao mi je, OpenStreetMap server nije reagirao kada je bio upitan za podatke.\n\nŽelite li pokušati ponovno? - existingrelation: Dodaj postojećoj relaciji - findrelation: Nađi relaciju koja sadrži - gpxpleasewait: Molim pričekajte dok se GPX trag obrađuje. - heading_drawing: Crtanje - heading_introduction: Uvod - heading_pois: Početak - heading_quickref: Brze reference - heading_surveying: Istraživanje - heading_tagging: Označavanje (Tagging) - heading_troubleshooting: Rješavanje problema - help: Pomoć - help_html: "Dobrodošli u Potlatch\nPotlatch je editor koji se lako koristi za uređivanje OpenStreetMap-a. Crtajte ceste, staze, orjentire i trgovine iz GPS istaživanja, satelitskih slika ili starih karti.\n\nOve stranice pomoći će vas provesti kroz osnove korištenja Potlatch-a, i pokazati kako saznati više. Klikni naslove za početak.\n\nKada ste gotovi, klikinte bilo gdje na stranicu.\n\n\n\nKorisno je znati\nNe kopirajte s drugih karti !\n\nAko izaberete 'Uređuj uživo\" sve promjene koje napravite trenutno idu u bazu čim ih nacrtate. Ako niste toliko sigurni, izaberite 'Uređuj sa spremanjem', i onda će ići tek kada pritisnete 'Spremi'.\n\nBilo koja promjena koju napravite bit će prikazane na karti kroz sat ili dva (neke stvari čak i do tjedan). Nije sve prikazano na karti - izgledalo bi previše neuredno. Kako je su podaci Openstreetmap-a otvorenog koda, ljudi mogu napraviti prikaz karte s drukčijim izgledom - kao OpenCycleMap or Midnight Commander.\n\nZapamtite, to je ujedno karta koja dobro izgleda (pa ctrajte lijepe liijepe zavoje) i diagram za navigaciju (pa budite sigurni da ste spojili ceste na križanjima).\n\nDa li smo spomenuli da ne kopirate s drugih karti?\n\n\nSaznaj više\nPotlatch upute\nMailing liste\nOnline chat (pomoć uživo)\nWeb forum\nWiki zajednice\nPotlatch source-code\n\n\n\nPočetak\nSada kada imate otvoren Potlatch, 'Uređuj sa spremanjem' za početak.\n\nSpremni ste za crtanje karte. Najlakše je početi s ucrtavnjem točaka interesa ili POI. Ovo mogu biti kafići, restorani, crkve, željazničke stanice....sve što želite.\n\nPovuci i ispusti\nDa bi bilo super jednostavno, ispod karte se nalazi izbor najčešće korištenih POI. Postavljanje na kartu radi se jednostavnim povlačenjem ikone na kartu. Ne brinite ako je niste odmah pozicionarali ispravno: možete pomaći POI, dok ga ne namjestite. Upamtite da POI mora biti osvjetljen žuto kada je izabran.\n\nKada ste to napravili, dajte ime vašem kafiću, stanici, crkvi... Vidjet će te da se pojavila mala tablica ispod. Jedno od polja će biti \"Ime\" popraćeno s \"unesite ime\". Kliknite taj telst i unesite ime.\n\nKliknite negdje drugdje na karti da bi odslektirali vaš POI, i raznobojni panel se vraća.\n\nLako, zar ne? Klikni 'Spremi' (dolje desno) kad ste gotovi.\nPomjeranje okolo\nDa se premjestite na drugi dio karte, povucite kartu. Potlatch će automatski učitati nove podatke (gledajte gornji desni kut).\n\nRekli smo vam da 'Uređujete sa spremanjem', ali možete kliknuti i na 'Uređivanje uživo'. Ako idete uživo, sve promjene u bazi podataka su trenutne, tako da nema gumba 'Spremi'. Ovo je dobro za brze izmjene i mapping party-e.\n\nSlijedeći koraci\nZadovoljni s ovim svime? Odlično. Klikni 'Istraživanje' iznad da bi saznali kako postati pravi maper!\n\nIstraživanje s GPS-om\nIdeja iza Openstreetmap-a je da se napravi karta bez ograničavajućih autorskih prava drugih karti. Ovo znači da ne smijete kopirati drugr karte: morate izaći i istražiti ulice osobno. Na sreću to je jako zabavno! \nNajbolji način za istraživanje je sa GPS uređajem. Nađite područje koje nije kartirano, pa prošećite, provozajte se (biciklom, motorom, autom...) s uključenim GPS uređajem (i uključenim snimanjem GPS traga). Zabilježite usput ulice i sve drugo interesantno (kafiće, crkve, itd.).\n\nKada dođete kući, GPS će sadržavati tzv. 'tracklog' ili zapis GPS traga gdje ste sve bili. Tada možete trag uploadirati na Openstreetmap.\n\nNajbolje je namjestiti GPS uređaj tako da često snima poziciju (svake sekunde ako je moguće) i da ima veliku memoriju. Puno mapera koristi ručne Garmin uređaje ili bluetooth uređaje. Detaljno su opisani GPS recenzije na našem wiki-u.\n\nUploadiranje GPS tragova\nSada, trebate skintui GPS trag s uređaja. Možda je vaš GPS došao s nekim softwareom, ili se kopira direktno s USB ili SD kartice. Ako ne, probajte GPSBabel. Štogod bilo, trebate datoteku u GPX formatu.\n\nTada koristite 'GPS tragovi' tab za upload vašeg traga na OpenstreetMap. Ali ovo je prva sitnica - neće se odma pokazati na karti.. Morate nacrtati i imenovati ceste osobno, koristeći trag kao vodilju.\nKorištenje vaših tragova\nNađite uploadani trag na listi 'GPS tragovi', i kliknite 'uredi' odmah pored. Potlatch će startati s ovim tragom učitanim i sa svim waypoint-ima. Spremni ste za crtanje!\n\nMožete također kliknuti ovaj gumb za prikaz GPS tragova svih članova (ali bez waypointa) za trenutno područje. Drži Shift za prikaz samo vašeg traga.\nKorištenje satelitskih snimki\nAko nemate GPS, ne brinite. U nekim gradovima, postoje satelitske snimke preko kojih možete precrtavati, ljubazno ustupio Yahoo! (hvala!). Izađite van i zabilježite nazive ulica, vratite se i imenujte precrtane ulice.\n\nAko ne vidite satelitsku snimku, klikite gumb postavke i izaberite 'Yahoo!'. Ako još uvijek ne vidite, vjerojatno odzumirajte (visoka rezolucija nije trenutno dostupna za sve gradove).\n\nNa ovom gumbu, postavke, naći ćete još nekoliko izbora kao karte s isteknutim autorskim pravom za Veliku Britaniju i OpenTopoMap za SAD. Ovo su specijalno izabrane, jer ih je dopušteno koristiti - ne kopirajte s ničije karte ili zračnih snimki. (Zakoni o autorskom pravu su njesra)\n\nPonekad su satelitske snikme malo pomaknute s točnog mjesta gdje su zapravo. ako naiđete na ovo, držite Space i povucite pozadinu dok se ne poravna. Uvijek vjerujte GPS tragovima više nego snimcima.\n\nCrtanje puteva\nDa nacrtate cestu (ili 'put') počnite na praznom mjestu na karti, samo kliknite i precrtajte preko traga. Kada ste gotovi dupli-klik ili pritisnite Enter - onda kliknite negdje da deselektirate cestu.\n\nZa crtanbje puta koji počinje od nekog drugog puta, njegove toče će biti crvene. Držite Dhift i kliknite jednu točku da započnete novi put na toj točki. (ako nema crvene točke na križanju, shift-click gdje hoćete novu!)\n\nKlikni 'Spremi' (dolje desno) kada ste gotovi. Spremajte često, u slučaju da server ima problema.\n\nNe očekujte vaše izmjene da budu odmah vidljive na karti. Obično traje oko sat - dva, ponekad i do tjedan dana.\nIzrada križanja\nStvarno je važno, da kada se 2 ceste spajaju, trebaju dijeliti točku. Planeri rute koriste ovo da bi znali gdje skrenuti.\n\nPotlatch birne o ovome sve dok pazite gdje kliknete točno na put koji spajate. Gledajte pomoćne znakove: točke zasvijetle plavo, pokazivač se promjeni, a kad ste gotovi križanje ima crni obrub.\nPremještanje i brisanje\nOvo radi kako i očekujete. Za brisanje točke, izaberite je i pritisnite Delete. Za brisanje cijelog puta, pritisnite Shift-Delete.\n\nZa premještanje, samo povucite. (Morati će te klinuti i držati za kratko kako ne bi bilo slučano)\nNapredno crtanje\nAko sva dijela puta imaju različita imena, morate ih razdvojiti. Kliknite put, onda kliknite točku na kojoj želite razdvojiti i klikinete škare. (Možete sjediniti puteve sa Shift+klik, ili Apple tipkom na Mac-u, ali ne možete sjediniti dvije ceste različitog imena ili tipa.)\n\nKružni tokovi su dosta teški za nacrtati ispravno. Ne brinite - Potlatch može pomoći. Samo nacrtajte krug ugrubo, ali da se spaja sam sa sobom na kraju, i onda kliknite ikonu da se 'porede' točke. (Isto tako možete izravnati ceste)\nTočka interesa\nPrvo što ste naučili je kako povući i ispustiti POI. Možete ih napravaviti tako da duplo kliknete na kartu; zeleni kružić se pojavljuje. Ali kako reći da je to kafić, crkva ili štoveć? Kliknete 'Označavanje' gore da otkrijete!\n\nKoji je ovo tip ceste?\nKada ste završili s crtanjem puta, trebate ga označiti što je. Jeli to glavna cesta, pješačka staza ili rijeka? Koje je ime? Ima li nekih specijalnih pravila (npr. jednosmjerna ulica)?\n\nU Openstreetmap, ovo snimate korištenjema 'oznaka'. Oznaka ima dva dijela, a možete ih imati koliko hoćete. Npr. možete dodati highway | primary da kažete da je to glavna cesta; highway | residential za cestu u naselju; ili highway | footway za pješačku stazu. Ako su bicikli zabranjeni, dodate bicycle | no. Da snimite ime, dodajte name | Tržna ulica.\n\nOznake u Potlatchu se pojavljuju na dnu ekrana - kliknite na postojeću cestu i vidjet će te koje oznake imaju. Klik na '+' znak (dolje desno) da dodate novu oznaku. Sa 'x' pored oznake ju brišete.\n\nMožete označiti cijeli put; točke na putu (npr. semafor ili kapije); ili toče interesa.\nKorištenje unaprijed namještenih oznaka (tagova)\nDa počnete, Potlatch ima spremne presete koji sadrže najpopulanije tagove.\n\nIzaberite put, i kliknite kroz simbole dok ne nađete odgovarajući. Onda, izaberite odgovarajuću opciju u meniju.\n\nOvo će popuniti oznake. Neki će ostati djelomično prazni da ih možete ukucati npr. ime ceste i broj.\nJednosmjerne ceste\nMožete dodati oznaku kao oneway | yes (za jednosmjernu ulicu) - ali kako odretiti smjer? Postoji strelica na dnu lijevo koa pokazuje smjer puta, od početka do kraja. Klikni za obrnuti smjer.\nIzabiranje vlastitih oznaka\nDakako, niste ograničeni na presete. Koristeći gumb '+' , možete koristiti oznake koje hoćete.\n\nMožete vidjeti koje oznake koriste drugi ljudi na OSMdoc, a ima i dugačka lista popularnih oznaka na našem wiki-u koja se zove Značajke karte.\n\nKako se OSM podaci koriste za izradu raznih karti, svaka karta će prikazivati (ili renderirati) neki izbor oznaka.\nRelacije\nPonekad oznake nisu dovoljne, i morate 'grupirati' dva ili više puta. Možda je zabranjeno skretanje s jedne na drugu cestu, ili 20 puteva čini biciklističku rutu. To možete napraviti s naprednim funkcijama koje se zovu 'relacije'. Pogledajte za više na wikiju.\n\nIspravljanje grešaka\nOvo je gumb za UNDO poništavanje promjena (možete pritisnuti i Z) - poništiti će zandnje promjene.\n\nMožete 'vratiti' prijašnju snimljenu verziju puta ili točke. Izaberite ke i kliknite njen ID (broj na dnu lijevo) - ili pritisnite H (za 'povijest'). Vidjet će te listu svakoga tko je uređivao i kada. Izaberite jedan i kliknite 'Vrati'.\n\nAko ste slučajno izbrisali put i spremili ga, pritisnite U (vraćanje obrisanog). Svi obrisani putevi će biti prikazani. Izaberite koji želite; otključajte ga s klikom na crveni lokot i snimite uobičajeno.\n\nMislite da je netko napravio grešku? Pošaljite im prijateljsku poruku. Pritisnite H i izaberite ime, onda kliknite 'Mail'\n\nKoristite Inspector (u meniju 'Napredno') za pomoćne informacije o trenutnom putu ili točki.\nFAQ\nKako da vidim waypointe?\nWaypointi se pokazuju ako kliknete 'uređivanje' pored imena traga na 'GPS tragovi'. Datoteka mora imai i waypointe i zabilježen trag - server odbija sve što ima samo waypointe.\n\nViše FAQ za Potlatch i OpenStreetMap.\n\n\n\nRadite brže\nŠto ste više odzumirali, Potlatch mora učitati više podatka. Zoomirajte prije klikanja na 'Uređivanje'.\n\nIsključite 'koristi oklovku i pokazivač ruke' (u postavkama) za najveću brzinu.\n\nAko je server spor, dođite poslije. Provjerite wiki za poznate probleme. Ponekad, kao nedjeljom uvečer, uvijek su zauzeti.\n\nRecite Potlatchu da memorira vaše omiljene setove oznaka. Izaberite put ili točku s tim oznakama, pritisnite Ctrl, Shift i broj od 1 do 9. Da bi koristili te memorirane oznake pritisnite Shift i broj. (bit će upamćeni svaki puta kada koristite POtlatch na tom kompjuteru)\n\nPretvorite svoju GPS trasu u put, tako da ga nađete na listi 'GPS tragovi', kliknite 'Uredi' i uključite 'pretvori'. Biti će zaključan (crven) i neće se snimiti. Prvo ga uredite, i onda kliknite crveni lokot da se otključa kada ste spremni za spremanje.\n\nŠto kliknuti\nPovuci kartu za kretanje okolo.\nDupli-click za novi POI.\nJedan-click za početak novog puta.\nDrži i povuci put ili POI za pomicanje.\nKada crtate put\nDupli-click ili pritisnite Enter za završetak crtanja.\nKlikni drugi put da se napravi križanje.\nShift-click kraj drugog put za spajanje.\nKada je izabran put\nKlikni točku za izbor\nShift-click u put za umetanje nove točke.\nShift-click a point da započnete novi put odatle.\nCtrl-click na drugi put za spajanje.\n\nTipkovničke kratie\nB Dodaj oznaku izvora pozadine\nC Zatvori changeset\nG Prikaži GPS tragovi\nH Pokaži povijest\nI Pokaži inspector\nJ Spoji točku putevima koji se križaju\n(+Shift) Unjoin from other ways\nK Zaključaj/otključak trenutni izbor\nL Pokaži trenutnu geografsku širinu/dužinu (latitude/longitude)\nM Maximiziraj prozor za uređivanje\nP Napravi paralelni put\nR Ponovi oznake (tag)\nS Spremi (osim ako uređujete uživo)\nT Posloži točke u liniju/krug\nU Vrati obrisano (prikaži obrisane puteve)\nX podijeli put u dva\nZ Undo\n- Ukloni točku s ovog puta\n+ Dodaj novu oznaku (tag)\n/ Izaberi drugo put koji dijeli ovu točku\nDelete Obriši točku\n (+Shift) Obriši cijeli put\nReturn Završi liniju koja se crta\nSpace Drži i povuci pozadinu\nEsc Odustani od uređivanja, ponovno učitavanje sa servera.\n0 Ukloni sve oznake (tag)\n1-9 Izaberi unaprijed postavljene oznake (tagove)\n (+Shift) Izaberi memorirane oznake\n (+S/Ctrl) Memoriraj oznake\n§ ili ` Izmjenjuj grupa oznaka (tagova)\n\n" - hint_drawmode: klikni za dodavanje točke\ndupli-klik/Return\nza završetak linije - hint_latlon: "lat $1\nlon $2" - hint_loading: učitavanje podataka - hint_overendpoint: preko krajnje točke ($1)\nklikni za spajanje\nshift-klik za sjedinjenje (merge) - hint_overpoint: Iznad točke $1)\nclick za spajanje - hint_pointselected: točka izabrana\n(shift-click točku da\nzapočneš novu liniju) - hint_saving: Spremanje podataka - hint_saving_loading: učitavanje/spremanje podataka - inspector: Inspektor - inspector_duplicate: "Duplikat od:" - inspector_in_ways: U putevima - inspector_latlon: "Lat $1\nLon $2" - inspector_locked: Zaključan - inspector_node_count: ($1 puta) - inspector_not_in_any_ways: Nema ni u jednom putu (POI) - inspector_unsaved: Nije spremljeno - inspector_uploading: (uploading) - inspector_way_connects_to: Spaja se na $1 puteva - inspector_way_connects_to_principal: Spaja se na $1 $2 i $3 drugi $4 - inspector_way_nodes: $1 točke - inspector_way_nodes_closed: $1 točaka (zatvoren) - loading: Učitavam... - login_pwd: "Lozinka:" - login_retry: Prijava na site nije prepoznata. Pokušajte ponovo. - login_title: Ne mogu se prijaviti - login_uid: "Korisničko ime:" - mail: Mail - more: Više - newchangeset: "Pokušajte ponovno: Potlatch će započeti novi changeset." - "no": Ne - nobackground: Bez pozadine - norelations: Nema relacija u treutnom području - offset_broadcanal: Put za vuču uz široki kanal - offset_choose: Izaberi offset (m) - offset_dual: Cesta s dvije prometnice (D2) - offset_motorway: Autocesta (D3) - offset_narrowcanal: Put uz uski kanal za vuču - ok: OK - openchangeset: Otvaram changeset - option_custompointers: Koristi olovku i ručne pokazivače - option_external: "Eksterno pokreni:" - option_fadebackground: Izbljedi pozadinu - option_layer_cycle_map: OSM - biciklistička karta - option_layer_maplint: OSM - Maplint (greške) - option_layer_nearmap: "Australija: NearMap" - option_layer_ooc_25k: UK povijesni 1:25k - option_layer_ooc_7th: "UK povijesni: 7th" - option_layer_ooc_npe: "UK povijesni: NPE" - option_layer_ooc_scotland: "UK povijesni: Škotska" - option_layer_os_streetview: "UK: OS pregled ulica" - option_layer_streets_haiti: "Haiti: imena ulica" - option_layer_surrey_air_survey: "UK: Surrey fotografije iz zraka" - option_layer_tip: Izaberite pozadinu za prikaz - option_limitways: Upozori kada se učitava puno podataka - option_microblog_id: "Naziv Microbloga:" - option_microblog_pwd: "Microblog lozinka:" - option_noname: Osvjetli neimenovane ceste - option_photo: "Fotografija KML:" - option_thinareas: Koristi tanke linije za područja - option_thinlines: Koristi tanke linije u svim uvećanjima - option_tiger: Osvjetli nepromjenjeni TIGER - option_warnings: Prikaži plutajuća upozorenja - point: Točka - preset_icon_airport: Zračna luka - preset_icon_bar: Bar - preset_icon_bus_stop: Autobusno stajalište - preset_icon_cafe: Caffe bar - preset_icon_cinema: Kino - preset_icon_convenience: Trgovina (dućan) - preset_icon_disaster: Zgrada u Haiti-u - preset_icon_fast_food: Fast food - preset_icon_ferry_terminal: Trajektni terminal - preset_icon_fire_station: Vatrogasna postaja - preset_icon_hospital: Bolnica - preset_icon_hotel: Hotel - preset_icon_museum: Muzej - preset_icon_parking: Parking - preset_icon_pharmacy: Ljekarna - preset_icon_place_of_worship: Crkva - preset_icon_police: Policijska postaja - preset_icon_post_box: Poštanski sandučić - preset_icon_pub: Pub - preset_icon_recycling: Reciklaža - preset_icon_restaurant: Restoran - preset_icon_school: Škola - preset_icon_station: Željeznički kolodvor - preset_icon_supermarket: Supermarket - preset_icon_taxi: Taxi - preset_icon_telephone: Telefon - preset_icon_theatre: Kazalište - preset_tip: Izaberite s izbora unaprijed napravljenih oznaka i opišite $1 - prompt_addtorelation: Dodaj $1 relaciji - prompt_changesetcomment: "Ukucajte opis vaših promjena:" - prompt_closechangeset: Zatvori changeset $1 - prompt_createparallel: Napravi paralelni put - prompt_editlive: Uredi uživo - prompt_editsave: Uredi sa spremanjem - prompt_helpavailable: Novi korisnik? Pogledaj dolje lijevo za pomoć. - prompt_launch: Pokreni eksterni URL - prompt_live: U načinu "Uredi uživo", svaka stavka koju promjenite će biti trenutno spremljena u OpenstreetMap bazu podataka - nije preporučljivo za početnike. Jeste li sigurni? - prompt_manyways: Ovo područje je vrlo detaljno i trebati će puno vremena za učitavanje. Želite li zoomirati? - prompt_microblog: Šalji na $1 ($2 ostalo) - prompt_revertversion: "Vrati na prijašnju spremljenu verziju:" - prompt_savechanges: Spremi promjene - prompt_taggedpoints: Neke od točaka na tom putu su označene ili u relacijama. Želite izbrisati? - prompt_track: Pretvori GPS trag u put - prompt_unlock: Klik za otključavanje - prompt_welcome: Dobrodošli na OpenStreetMap! - retry: Pokušaj ponovo - revert: Vrati na staro - save: Spremi - tags_backtolist: Povratak na popis - tags_descriptions: Opisi '$1' - tags_findatag: Pronađi oznaku (tag) - tags_findtag: Pronađi oznaku (tag) - tags_matching: Popularne oznake koje odgovaraju '$1' - tags_typesearchterm: "Unesite riječ za pretragu:" - tip_addrelation: Dodaj relaciji - tip_addtag: Dodaj novu oznaku (Tag) - tip_alert: Došlo je do greške - klikni za detalje - tip_anticlockwise: Kružni put smjera suprotno od kazaljke na satu - klikni za obratno - tip_clockwise: Kružni put u smjeru kazaljke na satu - klikni za obratni smjer - tip_direction: Smjer puta - klikni za obrnuti - tip_gps: Prikaži GPS tragove (G) - tip_noundo: Ništa za poništiti - tip_options: Postavke (izaberi pozadinu karte) - tip_photo: Učitaj fotografije - tip_presettype: Izaberi koji tip unaprijed postavljenih koji se nude u izborniku. - tip_repeattag: Ponovi oznake (Tags) sa prethodno izabranog puta (R) - tip_revertversion: Izaberi datum za vratiti - tip_selectrelation: Dodaj izabranoj ruti - tip_splitway: Podjeli put na izabranoj točki (X) - tip_tidy: Poredaj točke u putu (T) - tip_undo: Poništi $1 (Z) - uploading: Spremam... - uploading_deleting_pois: Brišem POI - uploading_deleting_ways: Brišem puteve - uploading_poi: Uploadiram POI $1 - uploading_poi_name: Uploadiram POI $1, $2 - uploading_relation: Snimam relaciju $1 na poslužitelj - uploading_relation_name: Snimam relaciju $1, $2 na poslužitelj - uploading_way: Uploadiram put $1 - uploading_way_name: Uploadiram put $1, $2 - warning: Upozorenje! - way: Put - "yes": Da diff --git a/config/potlatch/locales/hsb.yml b/config/potlatch/locales/hsb.yml deleted file mode 100644 index 56f600425..000000000 --- a/config/potlatch/locales/hsb.yml +++ /dev/null @@ -1,228 +0,0 @@ -# Messages for Upper Sorbian (Hornjoserbsce) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Michawiki -hsb: - a_poi: Dypk zajima $1 - a_way: Puć $1 - action_addpoint: suk kóncej puća přidać - action_cancelchanges: změny anulować na - action_changeway: změny na puću - action_createparallel: paralelne puće wutworić - action_createpoi: Dypk zajima wutworić - action_deletepoint: dypk wotstronić - action_insertnode: suk pućej přidać - action_mergeways: Dwaj pućej zjednoćić - action_movepoi: Dypk zajima přesunyć - action_movepoint: dypk přesunyć - action_moveway: puć přesunyć - action_pointtags: atributy za dypk připokzać - action_poitags: atributy za dypk zajima připokzać - action_reverseway: Puć wobroćić - action_revertway: puć wobroćić - action_splitway: puć dźělić - action_waytags: staja atributy na puć - advanced: Rozšěrjeny - advanced_close: Sadźbu změnow začinić - advanced_history: Pućna historija - advanced_inspector: Inspektor - advanced_maximise: Wokno maksiměrować - advanced_minimise: Wokno miniměrować - advanced_parallel: Paralelny puć - advanced_tooltip: Rozšěrjene wobdźěłanske akcije - advanced_undelete: Wobnowić - advice_bendy: Za zrunanje překřiwicaty (UMSCH za wunuzowanje) - advice_conflict: Serwerowy konflikt - dyrbiš snano znowa składować - advice_deletingpoi: Wotstronja se dypk zajima (Z za anulowanje) - advice_deletingway: Puc wotstronić (Z za anulowanje) - advice_microblogged: Twój status $1 bu zaktualizowany - advice_nocommonpoint: Puće nimaja zhromadny dypk - advice_revertingpoi: Do poslednjeho składowaneho dypka zajima wobroćić (Z za anulowanje) - advice_revertingway: Do poslednjeho składowaneho puć wobroćić (Z za anulowanje) - advice_tagconflict: Atributy so hromadźe njehodźa - prošu kontroluj (Z za anulowanje) - advice_toolong: Předołhi za zběhnjenje blokowanja - prošu do krótšich pućow rozdźělić - advice_uploadempty: Za nahraće ničo njeje - advice_uploadfail: Nahraće zastajene - advice_uploadsuccess: Wšě daty wuspěšnje nahrate - advice_waydragged: Puć zawlečeny (Z za anulowanje) - cancel: Přetorhnyć - closechangeset: Sadźbu změnow začinić - conflict_download: Wersiju sćahnyć - conflict_overwrite: Wersiju přepisać - conflict_poichanged: Wot toho, zo sy wobdźěłanje započał, je něchtó druhi dypk $1$2 změnił. - conflict_relchanged: Něchtó druhi je relaciju $1$2 změnił, wot toho, zo sy wobdźěłanje započał. - conflict_visitpoi: Klikń na 'W porjadku', zo by dypk pokazał. - conflict_visitway: Klikń na 'W porjadku', zo by puć pokazał. - conflict_waychanged: Něchtó je puć $1$2 změnił, wot toho, zo sy započał wobdźěłać. - createrelation: Nowu relaciju wutworić - custom: "Swójski:" - delete: Zničić - deleting: wotstronić - drag_pois: Dypki zajima přepołožić - editinglive: Live wobdźěłać - editingoffline: offline wobdźěłać - emailauthor: \n\nProšu pósćel richard\@systemeD.net e-mejl ze zmylkowym zdźělenku, a wopisaj, štož sy w tym wokomiku činił. '''(Jeli móžno jendźelsce)''' - error_anonymous: Njemóžeš anonymneho kartěrowarja kontaktować. - error_connectionfailed: Zwisk ze serwerom OpenStreetMap je bohužel njeporadźił. Nowy změny njejsu změnjene.\n\nChceš hišće raz spytać? - error_microblog_long: "Słanje powěsće do $1 je so njeporadźiło:\nHTTP-kode: $2\nZmylkowa powěsć: $3\nZmylk $1: $4" - error_nopoi: Dypk zajima njebu namakany (snano sy kartowy wurězk přesunył?), anulowanje njeje móžno. - error_nosharedpoint: Pućej $1 a $2 hižo nimatej zhromadny dypk, tohodla njemóžu rozdźělenje cofnyć. - error_noway: Puć $1 njehodźi so namakać (snano sy kartowy wurězk přesunył?), anulowanje njeje móžno. - error_readfailed: Bohužel serwer OpenStreetMap njeje wotmołwił, hdyž sy daty požadał.\n\nChceš hišće raz spytać? - existingrelation: Eksistowacej relaciji přidać - findrelation: Relaciju namakać, kotraž wobsahuje - gpxpleasewait: Prošu čakaj, mjeztym zo so GPX-čara předźěłuje. - heading_drawing: Rysować - heading_introduction: Zawjedźenje - heading_pois: Prěnje kroki - heading_quickref: Spěšna referenca - heading_surveying: Krajměrjenje - heading_tagging: Atributowanje - heading_troubleshooting: Rozrisowanje problemow - help: Pomoc - help_html: "Witaj do Potlatch\nPotlatch je lochko wužiwajomny editor za OpenStreetMap. Narysuj dróhi, šćežki, mězniki a wobchody ze swojich GPS-měrjenjow, satelitowych wobrazow abo starych kartow.\n\nTute strony pomocy će wjedu přez zakłady wužiwanja editora Potlatch a informuja, hdźež móžeš wjace namakać. Klikń horjeka na nadpisma, zo by započał.\n\nHdyž sy hotowy, klikń prosće něhdźe na stronje.\n\n\n\nWužitny material, kotryž so měł znać\nNjekopěruj z druhich kartow!\n\nJeli wuběraš \"Live wobźěłać\", změny so w datowej bance tak składuja, kaž je rysuješ - takrjec hnydom. Jelic njejsy sej wěsty, wubjer \"Wobdžełać a składować\", a składuja so hakle, hdyž kliknješ na \"Skłasdować\".\n\nZměny, kotrež činiš, pokazuja so zwjetša na karće po jednej hodźinje abo dwěmaj hodźinomaj (někotre wěcy traja tydźeń). Nic wšitko pokazuje so na karće - to by přenjeporjadnje wupadało. Ale, dokelž daty OpenStreetMap su zjawny žórłowy kod, druzy ludźo su hotowi, karty zhotowić, kotrež wšelake aspekty pokazuja - kaž OpenCycleMap abo Midnight Commander.\n\nPomysl na to, zo je kaž rjana karta (rysuj potajkim rjane křiwki za křiwizny) tak tež diagram (zawěsć, zo dróhi so na křižowanišćach zwjazuja).\n\nSmy hižo naspomnili, zo njesměš z druhich kartow kopěrować?\n\n\nWjace zhonić\nPřiručnik Potlatch\nRozesyłanske lisćiny\nChat online (dynamiska pomoc)\nWebforum\nWiki zhromadźenstwa\nŽrědłowy kod Potlatch\n\n\n\nPrěnje kroki\nNětko je Potlatch startowany, klikń na \"Wobdźěłać a składować\", zo by započał.\n\nSy nětko na rysowanje karty přihotowany. Najlěpša akcija, zo by započało, je zarysowanje někotrych dypkow zajima (POI) na karće. To móhli hosćency, cyrkwje, dwórnišća... być, něšto, štož so ći spodoba.\n\nPřepołožić\nTo make it super-easy, you'll see a selection of the most common POIs, right at the bottom of the map for you. Putting one on the map is as easy as dragging it from there onto the right place on the map. And don't worry if you don't get the position right first time: you can drag it again until it's right. Note that the POI is highlighted in yellow to show that it's selected.\n\nTak chětře hač sy to činił, daš swojemu korčmje (abo cyrkwi abo dwórnišću) mjeno. Budźeš widźeć, zo so mała tabela deleka jewi. Jedyn ze zapiskow rěka \"name\", kotryž \"(zapisaj tu mjeno)\" slěduje. Čiń to - klikń na tekst a zapisaj mjeno.\n\nKlikń něhdźe druhdźe na karće, zo by swój dypk zajima wotzwolił a mały barbny meni so wróći.\n\nLochko, nic? Klikń na \"Składować\" (deleka naprawo), hdyž sy hotowy.\nWokoło sunyć\nZo by prózdny wurězk na druhi dźěl karty přesunył, ćehń jón prosće tam. Potlatch nowe daty awtomatisce začita (hladaj horjeka naprawo).\n\nSmy ći porućili, zo maš \"Wobdźěłać a składować\" wužiwać, ale móžeš tež na \"Live wobdźěłać\" kliknyć. Jeli to činiš, so twoje změny direktnje do datoweje banki přewozmu, tohodla tam tłóčatko \"Składować\" njeje. To je dobre za spěšne změny a kartěrowanske partyje.\n\nPřichodne kroki\nWo wšěm tym zahorjeny? Wulkotnje. Klikń horjeka na \"Měrjenje\", zo by zhonił, kak stanješ so z prawym kartěrowarjom!\n\nZ GPS měrić\nThe idea behind OpenStreetMap is to make a map without the restrictive copyright of other maps. This means you can't copy from elsewhere: you must go and survey the streets yourself. Fortunately, it's lots of fun!\nThe best way to do this is with a handheld GPS set. Find an area that isn't mapped yet, then walk or cycle up the streets with your GPS switched on. Note the street names, and anything else interesting (pubs? churches?) , as you go along.\n\nWhen you get home, your GPS will contain a 'tracklog' recording everywhere you've been. You can then upload this to OpenStreetMap.\n\nThe best type of GPS is one that records to the tracklog frequently (every second or two) and has a big memory. Lots of our mappers use handheld Garmins or little Bluetooth units. There are detailed GPS Reviews on our wiki.\n\nTwoju čaru nahrać\nNow, you need to get your track off the GPS set. Maybe your GPS came with some software, or maybe it lets you copy the files off via USB. If not, try GPSBabel. Whatever, you want the file to be in GPX format.\n\nThen use the 'GPS Traces' tab to upload your track to OpenStreetMap. But this is only the first bit - it won't appear on the map yet. You must draw and name the roads yourself, using the track as a guide.\nSwójsku čaru wužiwać\nPytaj swoju nahratu čaru w lisćinje \"GPS-ćěrje\" a klikń na \"wobdźěłać\" direktnje pódla jeje. Potlatch započnje z nahratej čaru plus někajkimi pućnymi dypkami. Nětko móžeš z rysowanjom započeć!\n\nMóžeš tež na tute tłóčatko klinyć, zo by kóždehožkuli GPS-čary (ale nic pućne dypki) za aktualny wurězk pokazał. Dźerž tastu Umsch stłóčenu, zo by jenož swoje čary pokazał.\nWužiwanje satelitowych fotow\nIf you don't have a GPS, don't worry. In some cities, we have satellite photos you can trace over, kindly supplied by Yahoo! (thanks!). Go out and note the street names, then come back and trace over the lines.\n\nIf you don't see the satellite imagery, click the options button and make sure 'Yahoo!' is selected. If you still don't see it, it's probably not available for your city, or you might need to zoom out a bit.\n\nOn this same options button you'll find a few other choices like an out-of-copyright map of the UK, and OpenTopoMap for the US. These are all specially selected because we're allowed to use them - don't copy from anyone else's maps or aerial photos. (Copyright law sucks.)\n\nSometimes satellite pics are a bit displaced from where the roads really are. If you find this, hold Space and drag the background until it lines up. Always trust GPS tracks over satellite pics.\n\nPuće rysować\nTo draw a road (or 'way') starting at a blank space on the map, just click there; then at each point on the road in turn. When you've finished, double-click or press Enter - then click somewhere else to deselect the road.\n\nTo draw a way starting from another way, click that road to select it; its points will appear red. Hold Shift and click one of them to start a new way at that point. (If there's no red point at the junction, shift-click where you want one!)\n\nKlikń na \"Składować\" (deleka naprawo), hdyž sy hotowy. Składuj husto, jeli serwer ma problemy.\n\nNjewočakaj, zo so twoje změny hnydom na hownej karće jewja. Traje zwjetša jednu hodźinu abo dwě hodźinje, druhdy hač k jednemu tydźenjej.\nZwiski wutworić\nJe woprawdźe wažnje, zo dwaj pućej matej zhromadny dypk (abo \"suk\"), hdźež so zetkawatej. Rutowe planowaki jón wužiwaja, zo bychu wědźeli, hdźež so směr změni.\n\nPotlatch takes care of this as long as you are careful to click exactly on the way you're joining. Look for the helpful signs: the points light up blue, the pointer changes, and when you're done, the junction point has a black outline.\nPřesunyć a zničić\nTo funguje runje tak, kaž by to wočakował. Zo by dypk wotstronił, wubjer jón a tłóč na tastu Entf. Zo by cyły puć wotstronił, tłóč Umsch-Entf.\n\nTo move something, just drag it. (You'll have to click and hold for a short while before dragging a way, so you don't do it by accident.)\nRozšěrjone rysowanje\nIf two parts of a way have different names, you'll need to split them. Click the way; then click the point where it should be split, and click the scissors. (You can merge ways by clicking with Control, or the Apple key on a Mac, but don't merge two roads of different names or types.)\n\nRoundabouts are really hard to draw right. Don't worry - Potlatch can help. Just draw the loop roughly, making sure it joins back on itself at the end, then click this icon to 'tidy' it. (You can also use this to straighten out roads.)\nDypki zajima\nThe first thing you learned was how to drag-and-drop a point of interest. You can also create one by double-clicking on the map: a green circle appears. But how to say whether it's a pub, a church or what? Click 'Tagging' above to find out!\n\nKotry typ dróhi to je?\nTak chětře kaž sy liniju rysował, ty měł podać, štož to je. Je wón hłowna dróha, pućik abo rěka? Kak wón rěka? Su wosebite prawidła (na př. \"žane kolesa\")?\n\nIn OpenStreetMap, you record this using 'tags'. A tag has two parts, and you can have as many as you like. For example, you could add highway | trunk to say it's a major road; highway | residential for a road on a housing estate; or highway | footway for a footpath. If bikes were banned, you could then add bicycle | no. Then to record its name, add name | Market Street.\n\nAtributy jewja so w Potlatch deleka na wobrazowce - klikń na eksistowacu dróhu a budźeš widźeć, kotre atributy ma. Klikń na znamješko \"+\" (naprawo deleka), zo by nowy atribut přidał. Pismik \"x\" pódla kóždeho atributa zniči jón.\n\nMóžeš cyłym pućam atribut připokazać, dypkam na pućach (na př. wrota abo amplu) a dypkam zajima.\nNastajen atributy wužiwać\nZo by započał, móžeš přihotowane sadźby z najpopularnišimi atributami wužiwać.\n\nWubjer puć, klikń potom po symbolach, doniž njenamakaš přihódny. Wubjer potom přihódnu opciju z menija.\n\nThis will fill the tags in. Some will be left partly blank so you can type in (for example) the road name and number.\nJednosměrne dróhi\nYou might want to add a tag like oneway | yes - but how do you say which direction? There's an arrow in the bottom left that shows the way's direction, from start to end. Click it to reverse.\nSwójske atributy wubrać\nWězo njetrjebaš so na standardne atributy wobmjezować. Klikń na tłóčatko \"+\" a móžeš kóždežkuli atributy wužiwać.\n\nYou can see what tags other people use at OSMdoc, and there is a long list of popular tags on our wiki called Map Features. But these are only suggestions, not rules. You are free to invent your own tags or borrow from others.\n\nDokelž daty OpenStreetMap so wužiwaja, zo by so wjele rozdźělnych kartow wutworiło, budźe kóžda karta swójske atributy pokazać (\"rysować\").\nRelacije\nSometimes tags aren't enough, and you need to 'group' two or more ways. Maybe a turn is banned from one road into another, or 20 ways together make up a signed cycle route. You can do this with an advanced feature called 'relations'. Find out more on the wiki.\n\nZmylki anulować\nTo je tłóčatko \"Anulować\" (móžeš tež Z tłóčić) - wono budźe akciju anulować, kotruž sy jako poslednja činił.\n\nYou can 'revert' to a previously saved version of a way or point. Select it, then click its ID (the number at the bottom left) - or press H (for 'history'). You'll see a list of everyone who's edited it, and when. Choose the one to go back to, and click Revert.\n\nJeli sy puć mylnje zničił a to składował, tłóč tastu U (za \"undelete/wobnowić\"). Wšě zničene puće budu so pokazować. Wubjer tón, kotryž chceš; wotewri jón přez kliknjenje na čerwjeny zamk, a składuj kaž přeco.\n\nMysliš, zo něchtó druhi je zmylk činił? Pósćel jemu přećelnu powěsć. Wužij opciju historije (H), zo by jeho mjeno wubrał a klikń potom na \"Póst\".\n\nWužij Inspektor (w meniju \"Rozšěrjeny\") za wužitne informacije wo aktualnym puću abo dypku.\nČaste prašenja\nKak widźu swoje pućne dypki?\nPućne dypki so jenož pokazuja, hdyž kliknješ na \"wobdźěłać\" pódla mjena čary w \"GPS-ćerjach\". Dataja dyrbi pućne dypki kaž tež protokol čary wobsahować - serwer wotpokazuje wšitko, štož ma jenož pućne dypki.\n\nDalše časte prašenja za Potlatch a OpenStreetMap.\n\n\n\nSpěšnišo dźěłać\nČim dale sy pomjeńšił, ćim wjace datow Potlatch dyrbi začitać. Powjetš, prjedy hač kliknješ na \"Wobdźěłać\".\n\nWupiń \"Pisakowe a ručne pokazowaki wužiwać\" (we woknje Opcije) za maksimalnu spěšnosć.\n\nJeli serwer pomału běži, wróć so pozdźišo. Přepytaj wiki za znatymi problemami. Druhdy, kaž na př. po njedźelnišich wječorach, serwery su jara přećežene.\n\nTell Potlatch to memorise your favourite sets of tags. Select a way or point with those tags, then press Ctrl, Shift and a number from 1 to 9. Then, to apply those tags again, just press Shift and that number. (They'll be remembered every time you use Potlatch on this computer.)\n\nTurn your GPS track into a way by finding it in the 'GPS Traces' list, clicking 'edit' by it, then tick the 'convert' box. It'll be locked (red) so won't save. Edit it first, then click the red padlock to unlock when ready to save.\n\nNa čo kliknyć\nKartu ćahnyć, zo by so wokoło sunyła\nDwójce kliknyć, zo by so nowy dypk zajima wutworił.\nJedyn raz kliknyć, zo by so nowy puć zachopił.\nDźeržeć a puć abo dypk zajima ćahnyć, zo by so přesunył.\nHdyž so puć rysuje\nDwójce kliknyć abo zapodawansku tastu tłóčić, zo by so rysowanje skónčiło.\nNa druhi puć kliknyć, zo by so zwisk wutworił.\nNa kónc druheho puća ze stłóčenej tastu Umsch kliknyć, zo by so zwisk wutworił.\nHdyž so puć wuběra\nKlikń na dypk, zo by jón wubrał.\nNa kónc ze stłóčenej tastu Umsch kliknyć, zo by so nowy dypk zasunył.\nNa dypk ze stłóčenej tastu Umsch kliknyć, zo by so nowy puć wot tam zachopił.\nNa druhi puć ze stłóčenej tastu Strg kliknyć, zo by so zwisk wutworił.\n\nTastowe skrótšenki\nB Atribut pozadka přidać\nC Sadźbu změnow začinić\nG GPS-čary pokazać\nH Historiju pokazać\nI Inspektor pokazać\nJ Dypk na puće přizamknyć, kotrež so křizuja\n(+Shift) Unjoin from other ways\nK Aktualny wuběr blokować/dopušćić\nL Aktualny šěrokostnik/dołhostnik pokazać\nM Wobdźěłanske wokno maksiměrować\nP Paralelny puć wutworić\nR Atributy wospjetować\nS Składować (chibazo wobdźěłuješ live)\nT Do runeje linije/koła přetworić\nU Wobnowić (zničene puće pokazać)\nX Puć do dweju roztřihać\nZ Anulować\n- Dypk jenož z tutoho puća wotstronić\n+ Nowy atribut přidać\n/ Druhi puć wubrać, kotryž tutón dypk wužiwa\nEntf Dypk zničić\n (+Umsch) Cyły puć zničić\n(zapodawanska tasta) Rysowanje linije skónčić\n(Mjezerowa tasta) Dźeržeć a pozadk přesunyć\nEsc Tute wobdźěłanje přetorhnyć; ze serwera znowa začitać\n0 Wšě atributy wotstronić\n1-9 Nastajene atributy wubrać\n (+Umsch) Składowane atributy wubrać\n (+S/Strg) Atributy składować\n§ abo ` Wobběh mjez skupinami atributow\n\n" - hint_drawmode: Klikń, zo by dypk přidał\nklikń dwójce abo tłóč zapodawansku tastu, zo by liniju dokónčił - hint_latlon: "šěrokostnik $1\ndołhostnik $2" - hint_loading: daty začitać - hint_overendpoint: Nad kónčnym dypkom ($1)\nklikń, zo by přizamknył\nUmsch+kliknjenje za zjednoćenje - hint_overpoint: nad dypkom ($1)\nklikń, zo by jón přizamknył - hint_pointselected: dypk wubrany\n(Umsch+kliknjenje na dypk\n, zo by nowu liniju započał) - hint_saving: daty składować - hint_saving_loading: daty začitać/składować - inspector: Inspektor - inspector_duplicate: Duplikat wot - inspector_in_ways: Na pućach - inspector_latlon: "Šěrokostnik $1\nDołhostnik $2" - inspector_locked: Zawrjeny - inspector_not_in_any_ways: Nic na pućach (dypk zajima) - inspector_unsaved: Njeskładowany - inspector_uploading: (nahraće) - inspector_way_connects_to: Zwjazuje z $1 pućemi - inspector_way_connects_to_principal: Zwjazuje z $1 $2 a $3 dalšimi $4 - inspector_way_nodes: $1 sukow - inspector_way_nodes_closed: $1 sukow (žačinjenych) - loading: Začituje so... - login_pwd: "Hesło:" - login_retry: Twoje wužiwarske mjeno njebu spoźnane. Prošu spytaj hišće raz. - login_title: Přizjewjenje njemóžno - login_uid: "Wužiwarske mjeno:" - mail: Póst - more: Wjace - newchangeset: "\nProšu spytaj hišće raz: Potlatch započnje nowu sadźbu změnow." - "no": Ně - nobackground: Žadyn pozadk - norelations: W aktualnym wobłuku relacije njejsu - offset_broadcanal: Wlečna šćežka šěrokeho kanala - offset_choose: Wurunanje wubrać (m) - offset_dual: Awtodróha (D2) - offset_motorway: Awtodróha (D3) - offset_narrowcanal: Wlečna šćežka wuskeho kanala - ok: W porjadku - openchangeset: Sadźbu změnow wočinić - option_custompointers: Pisakowe a ručne pokazowaki wužiwać - option_external: "Eksterny start:" - option_fadebackground: Pozadk zeswětlić - option_layer_cycle_map: OSM - karta za kolesowarjow - option_layer_maplint: OSM - Maplint (zmylki) - option_layer_nearmap: "Awstralska: NearMap" - option_layer_ooc_25k: "Wulka Britaniska historisce: 1:25k" - option_layer_ooc_7th: "Wulka Britaniska historisce: 7th" - option_layer_ooc_npe: "Wulka Britaniska historisce: NPE" - option_layer_ooc_scotland: "Zjednoćene kralestwo historisce: Šotiska" - option_layer_os_streetview: "Zjednoćene kralestwo: OS StreetView" - option_layer_streets_haiti: "Haiti: dróhowe mjena" - option_layer_surrey_air_survey: "Zjednoćene kralestwo: Powětrowy wobraz Surrey" - option_layer_tip: Pozadk wubrać - option_limitways: Warnować, hdyž so jara wjele datow začituja - option_microblog_id: "Mjeno mikrobloga:" - option_microblog_pwd: "Mikroblogowe hesło:" - option_noname: Dróhi bjez mjena wuzběhnyć - option_photo: "Fotowy KML:" - option_thinareas: Ćeńše linije za wobłuki wužiwać - option_thinlines: Ćeńke linija na wšěch skalach wužiwać - option_tiger: Njezměnjeny TIGER wuzběhnyć - option_warnings: Běžace warnowanja pokazać - point: Dypk - preset_icon_airport: Lětanišćo - preset_icon_bar: Bara - preset_icon_bus_stop: Busowe zastanišćo - preset_icon_cafe: Kofejownja - preset_icon_cinema: Kino - preset_icon_convenience: Miniwiki - preset_icon_disaster: Haiti twarjenje - preset_icon_fast_food: Přikuski - preset_icon_ferry_terminal: Přewoz - preset_icon_fire_station: Wohnjostraža - preset_icon_hospital: Chorownja - preset_icon_hotel: Hotel - preset_icon_museum: Muzej - preset_icon_parking: Parkowanišćo - preset_icon_pharmacy: Lěkarnja - preset_icon_place_of_worship: Kultnišćo - preset_icon_police: Policajska straža - preset_icon_post_box: Listowy kašćik - preset_icon_pub: Korčma - preset_icon_recycling: Zwužitkowanje wotpadkow - preset_icon_restaurant: Hosćenc - preset_icon_school: Šula - preset_icon_station: Dwórnišćo, železniska stacija - preset_icon_supermarket: Superwiki - preset_icon_taxi: Taksijowe zastanišćo - preset_icon_telephone: Telefon - preset_icon_theatre: Dźiwadło - preset_tip: Z menija standardnych atributow wubrać, kotrež $1 wopisuja - prompt_addtorelation: $1 relaciji přidać - prompt_changesetcomment: "Zapodaj wopisanje swojich změnow:" - prompt_closechangeset: Sadźbu změnow $1 začinić - prompt_createparallel: Paralelny puć wutworić - prompt_editlive: Live wobdźěłać - prompt_editsave: Wobdźěłać a składować - prompt_helpavailable: Nowy wužiwar? Hlej deleka nalěwo za pomoc. - prompt_launch: Eksterny URL startować - prompt_live: W modus live so kóždy zapisk, kotryž měnješ, budźe so hnydom w datowej bance OpenStreetMap składować - za započatkarjow njeje to poručene. Chceš to woprawdźe činić? - prompt_manyways: Wobłuk ma wjele detailowa a budźe dołho trać jón začitać. Chceš jón powějtšić? - prompt_microblog: Powěsć do $1 ($2 zbytne) - prompt_revertversion: K staršej składowanej wersiji so wróćić - prompt_savechanges: Změny składować - prompt_taggedpoints: Někotre dypki na tutym puću su markěrowane abo w relacijach. Woprawdźe zničić? - prompt_track: GPS-čaru do pućow konwertować - prompt_unlock: Klikń, zo by so wotewrěło - prompt_welcome: Witaj do OpenStreetMap! - retry: Znowa spytać - revert: Wobroćić - save: Składować - tags_backtolist: Wróćo k lisćinje - tags_descriptions: Wopisanja wot '$1' - tags_findatag: Atribut namakać - tags_findtag: Atribut namakać - tags_matching: Popularne atributy za '$1' - tags_typesearchterm: "Zapodaj pytanski wuraz:" - tip_addrelation: Relaciji přidać - tip_addtag: Nowy atribut přidać - tip_alert: Zmylk je wustupił - klikń, zo by sej podrobnosće wobhladał - tip_anticlockwise: Kołowy puć přećiwo směrej časnika - klikń, zo by směr změnił - tip_clockwise: Kołowy puć do směra časnika - klikń, zo by směr změnił - tip_direction: Pućny směr - klikń, zo by so wobroćił - tip_gps: GPS-čary pokazać (G) - tip_noundo: Njeje ničo, kotrež hodźi so cofnyć - tip_options: Opcije nastajić (kartowy pozadk wubrać) - tip_photo: Fota začitać - tip_presettype: Typ standardnych nastajenjow wubrać, kotrež so w meniju poskićeja. - tip_repeattag: Atributy z prjedy wubraneho puća přewzać (R) - tip_revertversion: Wubjer datum, kotryž ma so přetworić - tip_selectrelation: Wubranej ruće přidać - tip_splitway: Puć na wubranym dypku dźělić (X) - tip_tidy: Dypki na puću rjadować (T) - tip_undo: $1 cofnyć (Z) - uploading: Nahrawa so... - uploading_deleting_pois: Dypki zajima zničić - uploading_deleting_ways: Puće zničić - uploading_poi: Nahrawa so dypk zajima $1 - uploading_poi_name: Nahrawa so dypk zajima $1, $2 - uploading_relation: Nahrawa so relacija $1 - uploading_relation_name: Nahrawa so relacija $1, $2 - uploading_way: Nahrawa so puć $1 - uploading_way_name: Nahrawa so puć $1, $2 - warning: Warnowanje! - way: Puć - "yes": Haj diff --git a/config/potlatch/locales/hu.yml b/config/potlatch/locales/hu.yml deleted file mode 100644 index 5017253fa..000000000 --- a/config/potlatch/locales/hu.yml +++ /dev/null @@ -1,231 +0,0 @@ -# Messages for Hungarian (Magyar) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: City-busz -# Author: Dani -# Author: Glanthor Reviol -hu: - a_poi: POI $1 - a_way: vonal $1 - action_addpoint: pont hozzáadása a vonal végéhez - action_cancelchanges: "módosítások elvetése:" - action_changeway: módosítások vonalhoz - action_createparallel: párhuzamos vonalak készítése - action_createpoi: POI készítése - action_deletepoint: pont törlése - action_insertnode: pont hozzáadása vonalhoz - action_mergeways: két vonal egyesítése - action_movepoi: POI mozgatása - action_movepoint: pont mozgatása - action_moveway: vonal mozgatása - action_pointtags: pont címkéinek módosítása - action_poitags: POI címkéinek módosítása - action_reverseway: vonal megfordítása - action_revertway: vonal visszaállítása - action_splitway: vonal kettévágása - action_waytags: vonal címkéinek módosítása - advanced: Haladó - advanced_close: Módosításcsomag lezárása - advanced_history: Vonal előzményei - advanced_inspector: Felügyelő - advanced_maximise: Ablak maximalizálása - advanced_minimise: Ablak minimalizálása - advanced_parallel: Párhuzamos vonal - advanced_tooltip: Haladó szerkesztési műveletek - advanced_undelete: Törlés visszavonása - advice_bendy: Túl görbe a kiegyenesítéshez (SHIFT a kényszerítéshez) - advice_conflict: Szerver ütközés - lehet, hogy újra meg kell próbálnod menteni. - advice_deletingpoi: POI törlése (Z a visszavonáshoz) - advice_deletingway: Vonal törlése (Z a visszavonáshoz) - advice_microblogged: $1 állapotod frissítve - advice_nocommonpoint: A vonalaknak nincs közös pontjuk - advice_revertingpoi: Visszaállítás a legutóbb mentett POI-ra (Z a viszavonáshoz) - advice_revertingway: Visszaállítás a legutóbb mentett vonalra (Z a visszavonáshoz) - advice_tagconflict: A címkék nem egyeznek - ellenőrizd (Z a visszavonáshoz) - advice_toolong: Túl hosszú a feloldáshoz - vágd rövidebb szakaszokra - advice_uploadempty: Nincs mit feltölteni - advice_uploadfail: Feltöltés megállítva - advice_uploadsuccess: Az összes adat sikeresen feltöltve - advice_waydragged: Vonal áthelyezve (Z a visszavonáshoz) - cancel: Mégse - closechangeset: Módosításcsomag lezárása - conflict_download: Az ő változatának letöltése - conflict_overwrite: Az ő változatának felülírása - conflict_poichanged: Amióta elkezdtél szerkeszteni, valaki más módosította a(z) $1$2 pontot. - conflict_relchanged: Amióta elkezdtél szerkeszteni, valaki más módosította a(z) $1$2 kapcsolatot. - conflict_visitpoi: A pont megtekintéséhez kattints az OK-ra. - conflict_visitway: A vonal megtekintéséhez kattints az OK-ra. - conflict_waychanged: Amióta elkezdtél szerkeszteni, valaki más módosította a(z) $1$2 vonalat. - createrelation: Új kapcsolat létrehozása - custom: "Egyéni:" - delete: Törlés - deleting: törlése - drag_pois: Fogd és vidd az érdekes helyeket - editinglive: Élő mód - editingoffline: Offline mód - emailauthor: \n\nKérlek, jelentsd a hibát (angolul) a richard\@systemeD.net e-mail címre, és írd le, hogy mit csináltál akkor, amikor a hiba történt. - error_anonymous: Névtelen szerkesztővel nem tudsz kapcsolatba lépni. - error_connectionfailed: Sajnálom - az OpenStreetMap szerverhez való kapcsolódás sikertelen. A legutóbbi módosítások nem lettek elmentve.\n\nSzeretnéd megpróbálni újra? - error_microblog_long: "Küldés a(z) $1 helyre sikertelen:\nHTTP kód: $2\nHibaüzenet: $3\n$1 hiba: $4" - error_nopoi: A POI nem található (talán már eltávolítottad?), így nem vonható vissza. - error_nosharedpoint: A(z) $1 és a(z) $2 vonalaknak már nincs közös pontja, így nem vonható vissza a kettévágás. - error_noway: A(z) $1 nem található (talán már eltávolítottad?), így nem vonható vissza. - error_readfailed: Sajnálom - az OpenStreetMap szerver az adatok lekérdezésekor nem válaszolt.\n\nSzeretnéd megpróbálni újra? - existingrelation: Hozzáadás meglévő kapcsolathoz - findrelation: Kapcsolat keresése - gpxpleasewait: Várj a GPX nyomvonal feldolgozásáig. - heading_drawing: Rajzolás - heading_introduction: Bevezetés - heading_pois: Az első lépések - heading_quickref: Gyors referencia - heading_surveying: Felmérés - heading_tagging: Címkézés - heading_troubleshooting: Hibaelhárítás - help: Súgó - help_html: "Üdvözlünk a Potlatch-ben\nA Potlach egy könnyen használható szerkesztő az OpenStreetMap-hez. Rajzolj utakat, ösvényeket, nevezetes helyeket és üzleteket a GPS felméréseid, műholdképek vagy régi térképek alapján.\n\nEzek a súgóoldalak végigvezetnek a Potlatch használatának alapjain, és megmutatják, hol találhatsz további információkat. Kattints a fenti fejléc-címekre a kezdéshez.\n\nHa befejezted, csak kattints bárhova a lapon.\n\n\n\nHasznos tudnivalók\nNe másolj más térképekről!\n\nHa az „Élő szerkesztés”-t választod, minden változtatásod azonnal az adatbázisba kerül, amint megrajzolod azokat. Ha nem vagy ilyen magabiztos, válaszd a „Szerkesztés mentéssel”-t, így csak akkor lépnek életbe a változtatásaid, ha a „Mentés” gombra kattintasz.\n\nA szerkesztéseid általában egy-két órán belül jelennek meg a térképen (de van, ami egy hétig is eltarthat). Nem látszik minden a térképen – túl zsúfolt lenne. De mivel az OpenStreetMap adatai nyílt forrásúak, mások szabadon készíthetnek más térképeket más szempontok előtérbe helyezésével. Ilyenek az OpenCycleMap vagy a Midnight Commander.\n\nFigyelj rá, hogy egyaránt jól kinéző térkép (rajzolj szép görbéket a kanyaroknál) és diagram (az utak kapcsolódjanak a kereszteződéseknél) a cél.\n\nEmlítettük már, hogy ne másolj más térképekről?\n\n\nTudj meg többet\nPotlatch kézikönyv\nLevelezőlisták\nOnline chat (azonnali segítség)\nInternetes fórum\nKözösségi wiki\nPotlatch forráskód\n\n\n\nElső lépések\nMost, hogy megnyitottad a Potlatch-ot, kattints a „Szerkesztés mentéssel”-re a kezdéshez.\n\nSzóval készen állsz a térképrajzolásra. A legkönnyebb kezdés az, ha elhelyezel néhány érdekes helyet (más néven POI-t) a térképen. Ezek lehetnek kocsmák, templomok, vasútállomások… bármi, amit szeretnél.\n\nFogd és vidd\nAnnak érdekében, hogy a lehető legegyszerűbb legyen, rendelkezésre áll egy válogatás a leggyakoribb POI-kból. Térképre helyezésük olyan egyszerű, hogy csak fogd meg az egyiket, és helyezd a térkép megfelelő helyére. És ne aggódj, ha nem találod el a helyes pozíciót elsőre: megfoghatod újra, amíg jó nem lesz. Ne feledd, hogy a POI sárgával ki van emelve, ami jelzi, ki van jelölve.\n\nMiután ezzel megvagy, szeretnél megadni a kocsmának (vagy templomnak, állomásnak) egy nevet. Látni fogod, hogy megjelenik egy kis táblázat alul. A bejegyzések egyikében „name” után „(type name here)” szerepel. Kattints erre a szövegre, és írd be a nevet.\n\nKattints valahova máshova a térképen a POI kijelölésének megszüntetéséhez, és visszajön a színes kis panel.\n\nKönnyű, nem? Kattints a „Mentés”-re (jobbra lent) ha készen vagy.\nMozgatás\nAhhoz, hogy mozogj a térkép egy eltérő részére, csak húzz egy üres területet. A Potlatch automatikusan be fogja tölteni az új adatokat (nézd a jobb felső sarkot).\n\nÍrtuk a „Szerkesztés mentéssel”-t, de szintén kattinthatsz az „Élő szerkesztés”-re. Ha ezt teszed, a változtatásaid azonnal az adatbázisba kerülnek, ezért nincs „Mentés” gomb. Ez gyors változtatásokhoz és mapping partikhoz jó.\n\nKövetkező lépések\nÖrülsz mindennek? Remek! Kattints a „Felmérés”-re fent, hogy megtudd, hogyan lehetsz igazi térképező!\n\nFelmérés GPS-szel\nAz OpenStreetMap alapötlete egy olyan térkép készítése, amely nem tartalmazza más térképek szerzői jogi megkötéseit. Ez azt jelenti, hogy nem másolhatsz máshonnan: neked kell menni és felmérni az utcákat saját magad. Szerencsére ez nagyon szórakoztató! Ennek a legjobb módja, ha kézi GPS készülékkel teszed ezt. Keress egy területet, amit még nem térképeztek fel, aztán járd be gyalog vagy biciklivel az utcákat bekapcsolt GPS-szel. Jegyezd fel az utcaneveket és minden más érdekeset (kocsmák? templomok?) az út mentén.\n\nAmikor hazaérsz, a GPS-ed tartalmazni fog egy nyomvonalnaplót, ami rögzített mindenütt, amerre voltál. Ezután feltöltheted ezt az OpenStreetMapra.\n\nA legjobb GPS típus az, amelyik gyakran (egy vagy két másodpercenként) rögzít a nyomvonalra, és nagy memóriája van. Sok térképezőnk kézi Garmint vagy kis Bluetooth egységet használ. Vannak részletes GPS értékelések a wikiben.\n\nNyomvonal feltöltése\nMost át kell töltened a nyomvonaladat a GPS készülékről. Lehet, hogy a GPS-edhez adtak szoftvert, vagy lehetővé teszi, hogy átmásold a fájlokat USB-n keresztül. Ha nem, próbáld a GPSBabelt. Mindenesetre azt szeretnéd, hogy a fájl GPX formátumú legyen.\n\nEzután használd a „Nyomvonalak” fület, hogy feltöltsd a nyomvonaladat az OpenStreetMapra. De ez csak az első lépés - nem jelenik még meg a térképen. Meg kell rajzolnod és el kell nevezned az utakat saját magad a nyomvonalat, mint vezetővonalat használva.\nNyomvonal használata\nKeresd meg a feltöltött nyomvonaladat a „Nyomvonalak” listában, és kattints a „szerkesztés”-re jobbra mellette. A Potlatch elindul ezzel a nyomvonallal és annak útpontjaival. Készen állsz a rajzoláshoz!\n\nKattinthatsz erre a gombra is, hogy megtekintsd mások GPS nyomvonalát (de nem útpontjait) az aktuális területen. Csak a saját nyomvonalaid megtekintéséhez tartsd lenyomva a Shiftet.\nMűholdképek használata\nHa nincs GPS-ed, ne aggódj. Néhány városban vannak műholdfotóink a Yahoo! által (köszönjük!), amiken nyomkövethetsz. Menj ki, és jegyezd fel az utcaneveket, aztán gyere vissza, és nyomkövesd a vonalakat.\n\nHa nem látsz műholdfelvételeket, kattints a beállítások gombra, és győződj meg róla, hogy a „Yahoo!” van kiválasztva. Ha még mindig nem látod, akkor valószínűleg nem érhető el a városodban, vagy távolítanod kell egy kicsit.\n\nUgyanezen a beállítások gombon találhatsz néhány egyéb választást, mint például közkincs térképet az Egyesült Királyságról és OpenTopoMap-ot az USA-hoz. Ezek mindegyike különlegesen választott, mert megengedjük a használatukat - ne másolj bármely más térképről vagy légifotókról. (Szerzői jogi szívás.)\n\nNéha a műholdképek egy kicsit elmozdultak onnan, ahol az utak valójában vannak. Ha ilyennel találkozol, tartsd lenyomva a szóközt, és vonszold a hátteret addig, amíg megfelelő helyre nem kerül. A GPS nyomvonalak mindig megbízhatóbbak a műholdképeknél.\n\nUtak rajzolása\nÚt (vagy vonal) rajzolása egy üres helytől kezdve a térképen: csak kattints oda, aztán minden egyes pontnál az út mentén. Amikor befejezted, kattints duplán, vagy nyomj Entert - majd az út kijelölésének megszüntetéséhez kattints valahova máshova.\n\nVonal rajzolása egy másik vonaltól kezdve: kattints erre az útra a kijelöléséhez; a pontjai pirossal jelennek meg. Tartsd lenyomva a Shift billentyűt, és kattints az egyik pontra új vonal kezdéséhez attól a ponttól. (Ha nincsenek piros pontok a kereszteződéseknél, akkor shift+kattintás, ahová szeretnél egyet!)\n\nKattints a „Mentés”-re (jobb oldalt alul), ha készen vagy. Ments gyakran, hátha a szervernek problémái támadnak.\n\nNe várd, hogy a változtatásaid azonnal megjelennek a fő térképen. Ez általában egy-két órát vesz igénybe, néhány esetben egy hetet is.\nKereszteződések készítése\nNagyon fontos, hogy ahol két út csatlakozik, legyen egy közös pontjuk. Az útvonaltervezők ezt használják, hogy tudják, hol lehet kanyarodni.\n\nA Potlatch mindaddig ügyel erre, amíg vigyázol arra, hogy pontosan arra a vonalra kattints, amelyiket csatlakoztatod. Figyeld a segítő jeleket: a pontok kék színűek lesznek, az egérmutató megváltozik, és amikor kész vagy, a kereszteződési pont egy fekete körvonalat kap.\nMozgatás és törlés\nÚgy működik, ahogy várható: pont törléséhez jelöld ki, majd nyomd meg a Delete billentyűt. Egész vonal törléséhez használd a Shift+Delete kombinációt.\n\nHa át szeretnél helyezni valamit, csak vonszold. (Kattintás után tartanod kell a vonalat egy rövid ideig az áthelyezés előtt, így nem történhet meg véletlenül.)\nHaladó rajzolás\nHa egy vonal két részének eltérő a neve, akkor ketté kell vágnod azt. Kattints a vonalra, majd kattints arra a pontra, ahol a vonalat ketté kell vágni, és kattints az ollóra. (Egyesíthetsz vonalakat Ctrl (Mac esetén Apple billentyű)+kattintással, de ne egyesíts két eltérő nevű vagy típusú utat.)\n\nKörforgalmakat igazán nehéz jól megrajzolni. Ne aggódj - a Potlatch tud segíteni. Csak rajzold meg durván a kört, győződj meg róla, hogy visszacsatlakozik önmagába a végén, majd a rendbetételéhez kattints erre az ikonra. (Ezt használhatod utak kiegyenesítéséhez is.)\nÉrdekes helyek\nAz első dolog, amit megtanultál az az, hogy hogyan fogj és vigyél egy érdekes helyet. Szintén készíthetsz egyet duplán kattintva a térképre: megjelenik egy zöld kör. De hogyan lehet megmondani, hogy ez egy kocsma, templom vagy mi? Kattints a „Címkézés”-re fent, hogy megtudd!\n\nMilyen típusú az út?\nHa megrajzoltál egy vonalat, meg kell adnod, mi az. Főút, gyalogút vagy esetleg egy folyó? Mi a neve? Vannak külön szabályok (pl. „kerékpárral behajtani tilos”)?\n\nAz OpenStreetMapban „címkék” használatával rögzítheted ezt. Egy címke két részből áll, és annyit használsz, amennyit csak szeretnél. Például megadhatod a highway | trunk címkét, hogy jelezd, ez egy fő út; a highway | residential címkét lakóövezeti utakhoz; vagy a highway | footway címkét gyalogutakhoz. Ha kerékpárral behajtani tilos, akkor megadhatod a bicycle | no címkét. Ezután rögzítheted a nevét a name | Market Street címke megadásával.\n\nA címkék a Potlatch-ban a képernyő alján jelennek meg - kattints egy létező útra, és látni fogod, milyen címkéi vannak. Új címke hozzáadásához kattints a „+” jelre (jobbra lent). Az „x” címkénként töröl.\n\nFelcímkézhetsz teljes vonalakat, azon elhelyezkedő pontokat (pl. kapu, jelzőlámpa), és érdekes helyeket (POI).\nElőre beállított címkék használata\nKezdéshez a Potlatch rendelkezik sablonokkal, amelyek tartalmazzák a legnépszerűbb címkéket.\n\nJelölj ki egy vonalat, majd kattintsd végig a szimbólumokat, amíg nem találsz egy megfelelőt. Aztán válaszd ki a legmegfelelőbb lehetőséget a menüből.\n\nEz kitölti a címkéket. Néhány részben üres marad, így beírhatod (például) az út nevét és számát.\nEgyirányú utak\nLehet, hogy meg szeretnél adni egy oneway | yes címkét - de hogy adod meg, hogy melyik irányba? Van egy nyíl a bal alsó sarokban, ami mutatja a vonal irányát a kezdetétől a végéig. Kattints rá a megfordításhoz.\nA saját címkéid kiválasztása\nTermészetesen nem vagy korlátozva a sablonokra. A „+” gomb használatával bármilyen címkét használhatsz.\n\nAz OSMdocon láthatod, hogy mások milyen címkéket használnak, és van egy hosszú lista a népszerű címkékről a wikiben, amit Térképelemeknek hívnak. De ezek csak javaslatok, nem szabályok. Szabadon kitalálhatsz saját címkéket, vagy kölcsönözhetsz másoktól.\n\nMivel az OpenStreetMap adatait sok különböző térkép használja, minden egyes térkép a címkék egy sajátos választékát jeleníti meg (vagy „rendereli”).\nKapcsolatok\nNéha a címkék nem elegendőek, és szükséded van partly „csoportosítani” kettő vagy több vonalat. Például tilos bekanyarodni egyik útról a másikra, vagy 20 vonal együttesen alkot egy jelzett kerékpárutat. Ezt egy haladó jellemzővel, úgynevezett „kapcsolat”-tal teheted meg. Tudj meg többet a wikiben.\n\nHibák visszavonása\nEz a visszavonás gomb (vagy használhatod a Z billentyűt is) – visszavonja azt, amit utoljára változtattál.\n\nVisszaállíthatsz egy vonalat vagy pontot egy előzőleg mentett változatra. Jelöld ki, aztán kattints az azonosítójára (a szám a bal alsó sarokban) - vagy nyomd meg a H billentyűt (az előzményekhez). Látni fogsz egy listát, amin mindenki szerepel, aki szerkesztette azt, és az is, hogy mikor. Válaszd ki az egyiket, amelyikre vissza szeretnél állni, és kattints a Visszaállításra.\n\nHa véletlenül töröltél egy vonalat és mentetted, nyomd meg az U billentyűt (a visszaállításhoz). Minden törölt vonal megjelenik. Válaszd ki azt, amelyiket vissza szeretnéd állítani; oldd fel a piros lakatra kattintva; és mentsd a szokásos módon.\n\nÚgy gondolod, hogy valaki más hibát vétett? Küldj neki egy barátságos levelet. Használd a történet gombot (H) a neve kiválasztásához, majd kattints az „e-mail”-re.\n\nHasználd a Felügyelőt (a „Haladó” menüben) hasznos információkért az aktuális vonalról vagy pontról.\nGYIK\nHogyan láthatom az útpontjaimat?\nAz útpontok csak akkor látszanak, ha a „szerkesztés”-re kattintasz a nyomvonal neve mellett a „Nyomvonalak” listájában. A fájlnak az útpontokat és a nyomvonalnaplót is tartalmaznia kell - a szerver elutasít mindent, amiben egyedül útpontok vannak.\n\nTovábbi GYIK a Potlatchhoz és az OpenStreetMaphoz.\n\n\n\nGyorsabb feldolgozás\nMinél inkább távolítasz, annál több adatot kell a Potlatch-nak betöltenie. Közelíts, mielőtt a „Szerkesztés”-re kattintasz.\n\nA legjobb sebességhez kapcsold ki a „toll és kéz kurzorok használata”-t (a beállítások ablakban).\n\nHa a szerver lassú, nézz vissza később. Ellenőrizd a wikit ismert problémák után. Néha (például vasárnap esténként) a szerver folyamatosan foglalt.\n\nAdd meg a Potlatch-nak, hogy megjegyezze kedvenc címkecsomagjaidat. Jelölj ki egy vonalat vagy pontot ezekkel a címkékkel, aztán nyomd meg a Ctrl, Shift billentyűt és egy számot 1-től 9-ig. Ezután, hogy alkalmazd ezeket a címkéket újra, csak nyomd meg a Shift billentyűt és ezt a számot. (Ezek megjegyzésre kerülnek minden alkalommal, amikor a Potlatch-ot használod ezen a számítógépen.)\n\nGPS nyomvonalad vonallá alakításához keresd meg a „Nyomvonalak” listájában, kattints a „szerkesztés”-ére, aztán jelöld be a konvertálás jelölőnégyzetet. Zárolt (piros) lesz, így nem kerül mentésre. Először szerkeszd, aztán kattints a piros lakatra a feloldáshoz, amikor készen áll a mentésre.\n\nMire kattints\nVonszold a térképet a mozgatáshoz.\nKattints duplán új POI létrehozásához.\nEgy kattintás új vonal kezdéséhez.\nKattints és húzd a vonalat vagy POI-t áthelyezéshez.\nHa vonalat rajzolsz\nDupla kattintás vagy Enter a rajzolás befejezéséhez.\nKattintás egy másik vonalra kereszteződés készítéséhez.\nShift+kattintás egy másik vonal végén az egyesítéshez.\nHa egy vonal ki van jelölve\nKattints egy pontra a kijelöléséhez.\nShift+kattintás a vonalon új pont beillesztéséhez.\nShift+kattintás egy ponton új vonal indításához innen.\nCtrl+kattintás másik vonalon az egyesítéshez.\n\nGyorsbillentyűk\nB háttérforrás címke hozzáadása\nC módosításcsomag lezárása\nG GPS nyomvonalak megjelenítése\nH előzmények megjelenítése\nI felügyelő megjelenítése\nJ kapcsolódási pont vonalak kereszteződéséhez\n(+Shift) Unjoin from other ways\nK aktuális kijelölés zárolása/feloldása\nL aktuális szélességi/hosszúsági fok megjelenítése\nM szerkesztőablak teljes méretűvé változtatása\nP párhuzamos vonal rajzolása\nR címkék ismétlése\nS mentés (hacsak nem élőben szerkesztesz)\nT egyszerűsítés szabályos vonallá/körré\nU visszaállítás (törölt vonalak megjelenítése)\nX vonal kettévágása\nZ visszavonás\n- pont eltávolítása csak ebből a vonalból\n+ új címke hozzáadása\n/ a ponton osztozó másik vonal kijelölése\nDelete pont törlése\n (+Shift) egész vonal törlése\nEnter vonal rajzolásának befejezése\nSzóköz háttér megfogása és vonszolása\nEsc szerkesztés megszakítása, újratöltés a szerverről\n0 összes címke eltávolítása\n1-9 előre beállított címkék kiválasztása\n (+Shift) megjegyzett címkék kiválasztása\n (+S/Ctrl) címkék megjegyzése\n$ vagy ` váltás a címkecsoportok között\n\n" - hint_drawmode: kattintás pont hozzáadásához\ndupla kattintás/Enter\na vonal befejezéséhez - hint_latlon: "szélesség $1\nhosszúság $2" - hint_loading: adatok betöltése - hint_overendpoint: végpont fölött ($1)\nkattintás a csatlakoztatáshoz\nshift+kattintás az egyesítéshez - hint_overpoint: pont fölött ($1)\nkattintás a csatlakoztatáshoz - hint_pointselected: pont kijelölve\n(shift+kattintás a pontra\núj vonal kezdéséhez) - hint_saving: adatok mentése - hint_saving_loading: adatok betöltése/mentése - inspector: Felügyelő - inspector_duplicate: "A következő másolata:" - inspector_in_ways: "A következő vonalakon:" - inspector_latlon: "Szélesség $1\nHosszúság $2" - inspector_locked: Zárolva - inspector_node_count: ($1 alkalommal) - inspector_not_in_any_ways: Egyik vonalon sincs rajta (POI) - inspector_unsaved: Nincs mentve - inspector_uploading: (feltöltés) - inspector_way_connects_to: $1 vonalhoz csatlakozik - inspector_way_connects_to_principal: $1 $2 vonalhoz és $3 másik $4 vonalhoz csatlakozik - inspector_way_nodes: $1 pont - inspector_way_nodes_closed: $1 pont (zárt) - loading: Betöltés… - login_pwd: "Jelszó:" - login_retry: A webhelyre való bejelentkezésed nem ismerhető fel. Kérlek, próbáld újra. - login_title: Nem lehet bejelentkezni - login_uid: "Felhasználónév:" - mail: Levél - more: Több - newchangeset: "\nKérlek, próbáld újra: a Potlatch egy új módosításcsomagot fog kezdeni." - "no": Nem - nobackground: Nincs háttérkép - norelations: Nincs kapcsolat a jelenlegi területen - offset_broadcanal: Széles csatorna - offset_choose: Válassz eltolást (m) - offset_dual: Osztott pályás út (D2) - offset_motorway: Autópálya (D3) - offset_narrowcanal: Keskeny csatorna - ok: OK - openchangeset: Módosításcsomag megnyitása - option_custompointers: Toll és kéz egérmutatók használata - option_external: "Külső indítása:" - option_fadebackground: Áttetsző háttér - option_layer_cycle_map: OSM - kerékpártérkép - option_layer_maplint: OSM - Maplint (hibák) - option_layer_nearmap: "Ausztrália: NearMap" - option_layer_ooc_25k: "UK történelmi: 1:25k" - option_layer_ooc_7th: "UK történelmi: 7th" - option_layer_ooc_npe: "UK történelmi: NPE" - option_layer_ooc_scotland: "UK történelmi: Skócia" - option_layer_os_streetview: "UK: OS utcanézet" - option_layer_streets_haiti: "Haiti: utcanevek" - option_layer_surrey_air_survey: "UK: Surrey légi felmérés" - option_layer_tip: Válaszd ki a megjelenítendő hátteret - option_limitways: Figyelmeztetés sok adat betöltése előtt - option_microblog_id: "Mikroblog neve:" - option_microblog_pwd: "Mikroblog jelszava:" - option_noname: Névtelen utak kiemelése - option_photo: "Fotó KML:" - option_thinareas: Vékonyabb vonalak használata területekhez - option_thinlines: Vékony vonalak használata minden méretaránynál - option_tiger: Módosítatlan TIGER kiemelése - option_warnings: Lebegő hibaüzenetek megjelenítése - point: Pont - preset_icon_airport: Repülőtér - preset_icon_bar: Bár - preset_icon_bus_stop: Buszmegálló - preset_icon_cafe: Kávézó - preset_icon_cinema: Mozi - preset_icon_convenience: Élelmiszerbolt - preset_icon_disaster: Haiti épület - preset_icon_fast_food: Gyorsétterem - preset_icon_ferry_terminal: Komp - preset_icon_fire_station: Tűzoltóság - preset_icon_hospital: Kórház - preset_icon_hotel: Szálloda - preset_icon_museum: Múzeum - preset_icon_parking: Parkoló - preset_icon_pharmacy: Gyógyszertár - preset_icon_place_of_worship: Templom - preset_icon_police: Rendőrség - preset_icon_post_box: Postaláda - preset_icon_pub: Kocsma - preset_icon_recycling: Szelektív hulladékgyűjtő - preset_icon_restaurant: Étterem - preset_icon_school: Iskola - preset_icon_station: Vasútállomás - preset_icon_supermarket: Szupermarket - preset_icon_taxi: Taxiállomás - preset_icon_telephone: Telefon - preset_icon_theatre: Színház - preset_tip: Válassz egy sablont a menüből, amely leírja a(z) $1 elemet - prompt_addtorelation: $1 hozzáadása kapcsolathoz - prompt_changesetcomment: "Adj leírást a módosításaidhoz:" - prompt_closechangeset: $1 módosításcsomag lezárása - prompt_createparallel: Párhuzamos vonal készítése - prompt_editlive: Élő szerk. - prompt_editsave: Szerk. mentéssel - prompt_helpavailable: Új vagy? Segítségért nézd a jobb alsó sarkot. - prompt_launch: Külső URL indítása - prompt_live: Élő módban minden elem, amit megváltoztatsz, azonnal el lesz mentve az OpenStreetMap adatbázisába – ez kezdőknek nem ajánlott. Biztos vagy benne? - prompt_manyways: Ez a terület nagyon részletes, és sokáig fog tartani a betöltése. Szeretnél ráközelíteni? - prompt_microblog: "Küldés ide: $1 ($2 van hátra)" - prompt_revertversion: "Korábbi mentett változat visszaállítása:" - prompt_savechanges: Módosítások mentése - prompt_taggedpoints: Ezen a vonalon van néhány pont, amely címkézett, vagy kapcsolat tagja. Biztosan törlöd? - prompt_track: GPS nyomvonal átalakítása vonalakká - prompt_unlock: Kattints a feloldáshoz - prompt_welcome: Üdvözlünk az OpenStreetMapon! - retry: Újra - revert: Visszaáll. - save: Mentés - tags_backtolist: Vissza a listához - tags_descriptions: "'$1' leírása" - tags_findatag: Címke keresése - tags_findtag: Címke keresése - tags_matching: "Népszerű címkék, amelyek illeszkednek a következőre: '$1'" - tags_typesearchterm: "Írj be egy szót a kereséshez:" - tip_addrelation: Hozzáadás kapcsolathoz - tip_addtag: Új címke hozzáadása - tip_alert: Hiba történt - kattints a részletekért - tip_anticlockwise: Órajárással ellentétes körkörös vonal - kattints a megfordításhoz - tip_clockwise: Órajárással egyező körkörös vonal - kattints a megfordításhoz - tip_direction: Vonal iránya - kattints a megfordításhoz - tip_gps: GPS nyomvonalak megjelenítése (G) - tip_noundo: Nincs mit visszavonni - tip_options: Beállítások módosítása (térkép háttérképének kiválasztása) - tip_photo: Fényképek betöltése - tip_presettype: Válaszd ki, hogy milyen sablonok jelenjenek meg a menüben. - tip_repeattag: Az előzőleg kiválasztott vonal címkéinek megismétlése (R) - tip_revertversion: Válaszd ki a dátumot a visszaállításhoz - tip_selectrelation: Hozzáadás a kiválasztott kapcsolathoz - tip_splitway: Vonal kettévágása a kijelölt pontnál (X) - tip_tidy: Vonal pontjainak tisztítása (T) - tip_undo: "Visszavonás: $1 (Z)" - uploading: Feltöltés... - uploading_deleting_pois: POI-k törlése - uploading_deleting_ways: Vonalak törlése - uploading_poi: $1 POI feltöltése - uploading_poi_name: $1, $2 POI feltöltése - uploading_relation: $1 kapcsolat feltötlése - uploading_relation_name: $1, $2 kapcsolat feltöltése - uploading_way: $1 vonal feltöltése - uploading_way_name: $1, $2 vonal feltöltése - warning: Figyelmeztetés! - way: Vonal - "yes": Igen diff --git a/config/potlatch/locales/ia.yml b/config/potlatch/locales/ia.yml deleted file mode 100644 index bbe2fb595..000000000 --- a/config/potlatch/locales/ia.yml +++ /dev/null @@ -1,229 +0,0 @@ -# Messages for Interlingua (Interlingua) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: McDutchie -ia: - a_poi: $1 un PDI - a_way: $1 un via - action_addpoint: adde un nodo al fin de un via - action_cancelchanges: cancella modificationes de - action_changeway: modificationes a un via - action_createparallel: crea vias parallel - action_createpoi: crea un PDI - action_deletepoint: dele un puncto - action_insertnode: adde un nodo a un via - action_mergeways: fusiona duo vias - action_movepoi: displacia un PDI - action_movepoint: displacia un puncto - action_moveway: displacia un via - action_pointtags: defini etiquettas super un puncto - action_poitags: defini etiquettas super un PDI - action_reverseway: inverte un via - action_revertway: reverte un via - action_splitway: divide un via - action_waytags: le definition de etiquettas in un via - advanced: Avantiate - advanced_close: Clauder le gruppo de modificationes - advanced_history: Historia del via - advanced_inspector: Inspector - advanced_maximise: Maximisar fenestra - advanced_minimise: Minimisar fenestra - advanced_parallel: Via parallel - advanced_tooltip: Actiones de modification avantiate - advanced_undelete: Restaurar - advice_bendy: Troppo curvose pro rectificar (SHIFT pro fortiar) - advice_conflict: Conflicto de servitor - es possibile que tu debe tentar salveguardar de novo - advice_deletingpoi: Dele PDI (Z pro disfacer) - advice_deletingway: Dele via (Z pro disfacer) - advice_microblogged: Actualisava tu stato de $1 - advice_nocommonpoint: Le vias non ha alcun puncto in commun - advice_revertingpoi: Reverte al ultime PDI salveguardate (Z pro disfacer) - advice_revertingway: Reverte al ultime via salveguardate (Z pro disfacer) - advice_tagconflict: Etiquettas non corresponde - per favor verifica (Z pro disfacer) - advice_toolong: Troppo longe pro disserrar - per favor divide in vias plus curte - advice_uploadempty: Nihil a incargar - advice_uploadfail: Incargamento interrumpite - advice_uploadsuccess: Tote le datos ha essite incargate con successo - advice_waydragged: Via displaciate (Z pro disfacer) - cancel: Cancellar - closechangeset: Claude gruppo de modificationes - conflict_download: Discargar su version - conflict_overwrite: Superscriber su version - conflict_poichanged: Post que tu comenciava a modificar, un altere persona ha cambiate le puncto $1$2. - conflict_relchanged: Post que tu comenciava a modificar, un altere persona ha cambiate le relation $1$2. - conflict_visitpoi: Clicca 'Ok' pro monstrar le puncto. - conflict_visitway: Clicca super 'Ok' pro vider le via. - conflict_waychanged: Post que tu comenciava a modificar, un altere persona ha cambiate le via $1$2. - createrelation: Crear un nove relation - custom: "Personalisate:" - delete: Deler - deleting: dele - drag_pois: Traher e deponer punctos de interesse - editinglive: Modification in directo - editingoffline: Modification foras de linea - emailauthor: \n\nInvia e-mail a richard\@systemeD.net con un reporto del defecto, explicante lo que tu faceva quando le problema se manifestava. - error_anonymous: Tu non pote contactar un cartographo anonyme. - error_connectionfailed: Le connexion al servitor de OpenStreetMap falleva. Le modificationes recente non ha essite salveguardate.\n\nReprobar? - error_microblog_long: "Le publication in $1 falleva:\nCodice HTTP: $2\nMessage de error: $3\nError de $1: $4" - error_nopoi: Le PDI non pote esser trovate (ha tu displaciate le carta?) dunque es impossibile disfacer. - error_nosharedpoint: Le vias $1 e $2 non ha plus alcun puncto in commun, dunque es impossibile disfacer le separation. - error_noway: Le via $1 non pote esser trovate (ha tu displaciate le carta?) dunque es impossibile disfacer. - error_readfailed: Le servitor de OpenStreetMap non respondeva al demanda de datos.\n\nReprobar? - existingrelation: Adder a un relation existente - findrelation: Cerca un relation que contine - gpxpleasewait: Per favor attende durante le tractamento del tracia GPX. - heading_drawing: Designo - heading_introduction: Introduction - heading_pois: Como initiar - heading_quickref: Referentia rapide - heading_surveying: Topometria - heading_tagging: Etiquettage - heading_troubleshooting: Resolution de problemas - help: Adjuta - help_html: "Benvenite a Potlatch\nPotlatch es le editor facile a usar pro OpenStreetMap. Designa vias, camminos, punctos de interesse e botecas a partir de tu topometria GPS, de imagines de satellite o de cartas ancian.\n\nIste paginas de adjuta te guida per le aspectos fundamental de usar Potlatch, e te indica ubi trovar plus informationes. Clicca super le titulos ci supra pro comenciar.\n\nQuando tu ha finite, simplemente clicca in qualcunque altere loco del pagina.\n\n\n\nCosas utile a saper\nNon copia de altere cartas!\n\nSi tu selige 'Modificar in directo', omne modificationes que tu face essera transmittite in le base de datos quando tu los designa - isto vole dicer, immediatemente. Si tu non es si confidente, selige 'Modificar con salveguardar', e illos essera transmittite solo quando tu preme super 'Salveguardar'.\n\nLe modificationes que tu face se monstra normalmente in le carta post un hora o duo (alcun cosas prende un septimana). Non toto es monstrate in le carta, alteremente le aspecto esserea troppo chaotic. Ma, post que le datos de OpenStreetMap es libere, altere personas es libere de facer cartas que monstra altere aspectos - como OpenCycleMap o Midnight Commander.\n\nMemora te que il se tracta e de un carta elegante (dunque designa belle curvas pro le vias) e de un diagramma (dunque assecura que le vias se junge al cruciatas).\n\nHa nos ja mentionate que es prohibite copiar de altere cartas?\n\n\nLeger plus\nManual de Potlatch\nListas de diffusion\nChat in linea (adjuta in directo)\nForo web\nWiki del communitate\nCodice-fonte de Potlatch\n\n\n\nComenciar\nOra que tu ha aperite Potlatch, clicca super 'Modificar con salveguardar' pro comenciar.\n\nTu es dunque preste a designar un carta. Le plus facile, pro comenciar, es de placiar punctos de interesse super le carta - \"PDIs\". Istes pote esser tavernas, ecclesias, stationes ferroviari... omne cosa que te place.\n\nTraher e deponer\nPro render isto super-facile, tu videra un selection del PDIs le plus commun, justo al fundo de tu carta. Placiar un PDI super le carta es tanto simple como traher e deponer lo a su loco correcte in le carta. E non te inquieta si le position non es correcte le prime vice: tu pote traher lo de novo pro corriger lo. Nota que le PDI se mitte in le color jalne pro monstrar que illo es seligite.\n\nUn vice que tu ha facite isto, es recommendate dar un nomine a tu taverna (o ecclesia, o station). Tu videra que un micre tabella ha apparite in basso. Un del entratas essera \"nomine\" sequite per \"(digita nomine hic)\". Face lo - clicca super le texto, e entra le nomine.\n\nClicca in altere loco del mappa pro deseliger tu PDI, e le micre pannello colorate retornara.\n\nFacile, nonne? Clicca super 'Salveguardar' (in basso a dextra) quando tu ha finite.\nNavigar\nPro navigar a un altere parte del carta, simplemente trahe un area vacue. Potlatch cargara automaticamente le nove datos (observa lo in alto a dextra).\n\nNos te ha recommendate de 'Modificar con salveguardar', ma tu pote preferer 'Modificar in directo'. Si tu face isto, tu modificationes essera transmittite al base de datos immediatemente, dunque il non ha un button 'Salveguardar'. Isto es bon pro modificationes rapide e pro partitas de cartographia.\n\nProxime passos\nFelice con toto isto? Optimo. Clicca super 'Topometria' ci supra pro apprender como devenir un ver cartographo!\n\nTopometria con GPS\nLe idea con OpenStreetMap es facer un carta sin le copyright restrictive de altere cartas. Isto vole dicer que tu non pote copiar de altere loco: tu debe ir foras e explorar le stratas mesme. Felicemente, isto es bon divertimento!\nLe optime modo de facer isto es con un GPS portabile. Cerca un area non ancora cartographate, alora ambula o cycla per le stratas con tu GPS active. Nota le nomines del stratas e omne altere cosa interessante (tavernas? ecclesias?) durante le camminar.\n\nQuando tu arriva a casa, tu GPS continera un 'registro de tracia' de ubi tu ha essite. Tu pote cargar isto a OpenStreetMap.\n\nLe melior typo de GPS es un que face registrationes frequente del tracia (cata secunda o duo) e ha un grande memoria. Multes de nostre cartographos usa le Garmin portabile o micre unitates Bluetooth. Il ha detaliate recensiones de GPS in nostre wiki.\n\nCargar tu tracia\nOra tu debe extraher tu tracia del apparato GPS. Es possibile que illo es accompaniate de un software, o que illo te permitte copiar le files per USB. Si non, proba GPSBabel. Comocunque, le file resultante debe esser in formato GPX.\n\nAlora usa le scheda 'Tracias GPS' pro cargar tu tracia in OpenStreetMap. Ma isto es solmente le prime action - illo non apparera ancora in le carta. Tu debe designar e nominar le vias mesme, usante le tracia como guida.\nUsar tu tracia\nCerca tu tracia incargate in le lista 'Tracias GPS', e clicca super 'modificar' directemente juxta illo. Potlatch comenciara con iste tracia cargate, con omne punctos de via. Tu es preste a designar!\n\nTu pote tamben cliccar super iste button pro monstrar le tracias GPS de omnes (sin punctos de via) pro le area actual. Tene Shift premite pro monstrar solo tu tracias.\nUsar photos de satellite\nSi tu non ha un GPS, non te inquieta. In alcun citates, nos possede photos de satellite super le quales tu pote traciar, gentilmente fornite per Yahoo (gratias!). Va foras e nota le nomines del stratas, alora retorna e tracia super le lineas.\n\nSi tu non vide le imagines de satellite, clicca super le button Optiones e assecura que 'Yahoo!' es seligite. Si tu ancora non los vide, isto probabilemente non es disponibile pro tu citate, o forsan es necessari facer zoom retro.\n\nSuper iste mesme button Optiones tu trovara altere selectiones commo un carta foras de copyright del Regno Unite (RU), e OpenTopoMap pro le Statos Unite (SU). Tote istes es specialmente seligite proque nos ha le permission de usar los - non copia de cartas o photos aeree de altere personas. (Le lege de copyright es stupide.)\n\nAlcun vices le imagines de satellite es un poco displaciate relative al position real del camminos. Si isto es le caso, tene Spatio e trahe le fundo usque le positiones corresponde. Sempre fide te plus in le tracias del GPS que in le imagines de satellite.\n\nDesignar vias\nPro designar un cammino (o 'via') comenciante in un spatio blanc super le carta, simplemente clicca la; alora a cata puncto del cammino a su torno. Quando tu ha finite, face duple-clic o preme Enter - alora clicca in altere loco pro deseliger le cammino.\n\nPro designar un via comenciante ab un altere via, clicca super ille via pro seliger lo; su punctos apparera in rubie. Tene Shift e clicca super un de illos pro comenciar un nove via a ille puncto. (Si il non ha un puncto rubie al junction, face shift-clic ubi tu vole un!)\n\nClicca 'Salveguardar' (in basso a dextra) quando tu ha finite. Salveguarda frequentemente, in caso que le servitor ha problemas.\n\nNon expecta que tu modificationes se montra instantaneemente super le carta principal. Isto prende generalmente un hora o duo, a vices usque a un septimana.\nFacer junctiones\nEs multo importante que, quando duo camminos se junge, illos ha un puncto (o 'nodo') in commun. Le planatores de routes usa isto pro saper ubi cambiar de direction.\n\nPotlatch arrangia isto a condition que tu clicca exactemente super le via que tu vole junger. Observa ben le signales: le punctos appare in blau, le cursor del mouse cambia, e quando tu es finite, le puncto de junction habera un bordo nigre.\nDisplaciar e deler\nIsto funciona como tu lo expectarea. Pro deler un puncto, selige lo e preme le clave \"Delete\". Pro deler un via integre, preme \"Shift\"+\"Delete\".\n\nPro displaciar un cosa, simplemente trahe lo. (Tu debe cliccar e tener un poco ante de traher. Isto es pro evitar que tu lo face per accidente.)\nDesigno plus avantiate\nSi duo partes de un via ha differente nomines, tu debe divider los. Clicca super le via; alora clicca super le puncto ubi illo debe esser dividite, e clicca super le cisorios. (Tu pote fusionar vias con Control+clic, o Apple+clic in un Mac, ma non fusiona duo vias de differente nomines o typos).\n\nLe rotundas es multo difficile de designar correctemente. Non te inquieta; Potlatch pote adjutar. Simplemente designa le circulo in forma brute, assecurante que illo es connectite con se mesme al fin, e postea clicca super iste icone pro 'perfectionar' lo. (Tu pote tamben usar isto pro rectificar vias.)\nPunctos de interesse\nLe prime cosa que tu apprendeva esseva como traher-e-deponer un puncto de interesse. Tu pote tamben crear un con un duple-clic super le carta: un circulo verde appare. Ma como indicar que illo es un taverna, un ecclesia o altere cosa? Clicca super 'Etiquettage' ci supra pro discoperir lo!\n\nQual typo de via es illo?\nQuando tu ha designate un via, tu debe indicar lo que illo es. Es illo un strata principal, un sentiero o un riviera? Que es su nomine? Ha il regulas special (p.ex. \"prohibite al bicyclettas\")?\n\nIn OpenStreetMap, tu indica isto con 'etiquettas'. Un etiquetta ha duo partes, e tu pote usar tantes como tu vole. Per exemplo, tu pote adder highway | trunk pro indicar un strata principal; highway | residential pro un cammino in un area residential; o highway | footway pro un sentiero pro pedones. Si le bicyclettas es prohibite, tu pote alora adder bicycle | no. Postea, pro indicar le nomine, adde name | Strata del Mercato.\n\nLe etiquettas in Potlatch appare in basso del schermo - clicca super un cammino existente pro vider qual etiquettas illo ha. Clicca super le signo '+' (in basso al dextra) pro adder un nove etiquetta. Le 'x' juxta cata etiquetta es pro deler lo.\n\nTu pote etiquettar vias integre; punctos in vias (como un porta o lumine de traffico); e punctos de interesse.\nUsar etiquettas predefinite\nPro adjutar te a comenciar, Potlatch te ha ja predefinite le etiquettas le plus popular.\n\nSelige un via, alora clicca per le symbolos usque tu trova un que es convenibile. Postea selige le option le plus appropriate del menu.\n\nIsto completara le etiquettas. Alcunes essera lassate partialmente vacue de sorta que tu pote entrar (per exemplo) le nomine en numero del strata.\nVias unidirectional\nTu pote adder un etiquetta como oneway | yes, ma como indicar le direction? Il ha un sagitta in basso a sinistra que monstra le direction del via, del initio al fin. Clicca super illo pro inverter lo.\nSeliger tu proprie etiquettas\nNaturalmente, tu non es limitate a solo le predefinitiones. Con le button '+' tu pote usar qualcunque etiquetta.\n\nTu pote vider qual etiquettas altere personas usa a OSMdoc, e il ha un longe lista de etiquettas popular in nostre wiki appellate Map Features. Ma istes es solo suggestiones, non regulas. Tu es libere de inventar tu proprie etiquettas o de copiar los de altere personas.\n\nPost que le datos de OpenStreetMap es usate pro facer multe differente cartas, cata carta monstrara (o 'rendera') su proprie selection de etiquettas.\nRelationes\nAlcun vices le etiquettas non suffice, e es necessari 'aggruppar' duo o plus vias. Forsan es prohibite tornar de un via in un altere, o 20 vias se combina in un route pro bicyclettas. Tu pote facer isto con un function avantiate appellate 'relationes'. Lege plus in le wiki.\n\nDisfacer errores\nIsto es le button de disfacer (tu pote tamben premer Z); illo disfacera le ultime cosa que tu faceva.\n\nTu pote 'reverter' a un version previemente salveguardate de un via o puncto. Selige lo, alora clicca super su ID (le numero in basso a sinistra), o preme H (pro 'historia'). Tu videra un lista de cata persona qui lo ha modificate e quando. Selige le version al qual retornar, e clicca Reverter.\n\nSi tu ha accidentalmente delite un via e lo ha salveguardate, preme U (pro 'undelete', 'restaurar'). Tote le vias delite essera monstrate. Selige le que tu vole; disserra lo per cliccar super le serratura pendente; e salveguarda como normal.\n\nPensa tu que alcuno altere ha facite un error? Invia le un message amical. Usa le option de historia (H) pro seliger su nomine, alora clicca super 'E-mail'.\n\nUsa le Inspector (in le menu 'Avantiate') pro informationes utile super le via o puncto actual.\nFAQ\nComo vider mi punctos de via?\nLe punctos de via se monstra solmente si tu clicca super 'modificar' juxta le nomine del tracia in 'Tracias GPS'. Le file debe continer e punctos de via e le registro de tracia; le servitor rejecta toto que contine solo punctos de via.\n\nFAQ ulterior pro Potlatch e OpenStreetMap.\n\n\n\nLaborar plus rapidemente\nQuanto plus distante le zoom, tanto plus datos Potlatch debe cargar. Face zoom avante ante de cliccar super 'Modificar'.\n\nDisactiva 'Usar cursores de penna e mano' (in le fenestra de optiones) pro velocitate maximal.\n\nSi le servitor functiona lentemente, reveni plus tarde. Da un oculata al wiki pro vider si il ha problemas. A alcun tempores, como dominica vespere, le activitate es sempre intense.\n\nDice a Potlatch de memorar tu collectiones favorite de etiquettas. Selige un via o puncto con iste etiquettas, alora preme Ctrl, Shift e un numero de 1 a 9. Postea, pro applicar iste etiquettas de novo, simplemente preme Shift e ille numero. (Illos essera memorate cata vice que tu usa Potlatch desde iste computator.)\n\nFace un via de tu tracia GPS: cerca lo in le lista 'Tracias GPS', clicca 'modificar' juxta illo, postea marca le quadrato 'converter'. Illo essera serrate (rubie) de sorta que illo non essera salveguardate. Modifica lo primo, alora clicca super le serratura pendente rubie pro disserar lo quando tu es preste a salveguardar.\n\nQue cliccar\nTrahe le carta pro navigar.\nDuple clic pro crear un nove PDI.\nSingule clic pro comenciar un nove via.\nTene e trahe un via o PDI pro displaciar lo.\nQuando tu designa un via\nDuple clic o preme Enter pro finir de designar.\nClic super un altere via pro facer un junction.\nShift+clic super le fin de un altere via pro fusionar.\nQuando un via es seligite\nClic super un puncto pro seliger lo.\nShift-clic in le via pro inserer un nove puncto.\nShift+clic super un puncto pro comenciar un nove via desde iste puncto.\nControl+clic super un altere via pro fusionar.\n\nCommandos de claviero\nB Adder un etiquetta de fonte al fundo\nC Clauder le gruppo de modificationes\nG Monstrar tracias GPS\nH Monstrar historia\nI Monstrar inspector\nJ Junger un puncto a vias cruciante\n(+Shift) Unjoin from other ways\nK Serrar/disserrar selection actual\nL Monstrar latitude/longitude actual\nM Maximisar fenestra de modification\nP Crear via parallel\nR Repeter etiquettas\nS Salveguardar (si non modificar in directo)\nT Rectificar linea o perfectionar circulo\nU Restaurar (monstrar vias delite)\nX Divider via in duo\nZ Disfacer\n- Remover puncto de iste via solmente\n+ Adder nove etiquetta\n/ Selige un altere via que ha iste puncto in commun\nDelete Deler puncto\n (+Shift) Deler via integre\nReturn Finir designar linea\nSpatio Tener e traher fundo\nEsc Abandonar iste modification; recargar del servitor\n0 Remover tote le etiquettas\n1-9 Seliger etiquettas predefinite\n (+Shift) Seliger etiquettas memorate\n (+S/Ctrl) Memorar etiquettas\n§ o ` Cambiar inter gruppos de etiquettas\n\n" - hint_drawmode: clic pro adder puncto\nduple clic/Return\pro terminar linea - hint_latlon: "lat $1\nlon $2" - hint_loading: carga datos - hint_overendpoint: super le puncto final ($1)\nclic pro junger\nshift-clic pro fusionar - hint_overpoint: super puncto ($1)\nclicca pro junger - hint_pointselected: puncto seligite\n(shift-clic super le puncto pro\ncomenciar un nove linea) - hint_saving: salveguarda datos - hint_saving_loading: carga/salveguarda datos - inspector: Inspector - inspector_duplicate: Duplicato de - inspector_in_ways: In vias - inspector_latlon: "Lat $1\nLon $2" - inspector_locked: Serrate - inspector_node_count: ($1 vices) - inspector_not_in_any_ways: Non presente in alcun via (PDI) - inspector_unsaved: Non salveguardate - inspector_uploading: (incargamento in curso) - inspector_way_connects_to: Connecte a $1 vias - inspector_way_connects_to_principal: Connecte a $1 $2 e $3 altere $4 - inspector_way_nodes: $1 nodos - inspector_way_nodes_closed: $1 nodos (claudite) - loading: Cargamento… - login_pwd: "Contrasigno:" - login_retry: Tu nomine de usator del sito non esseva recognoscite. Per favor reproba. - login_title: Non poteva aperir un session - login_uid: "Nomine de usator:" - mail: E-mail - more: Plus - newchangeset: "\\nPer favor reproba: Potlatch comenciara un nove gruppo de modificationes." - "no": 'No' - nobackground: Sin fundo - norelations: Nulle relation in area actual - offset_broadcanal: Cammino de remolcage de canal large - offset_choose: Seliger displaciamento (m) - offset_dual: Via a duo partes (D2) - offset_motorway: Autostrata (D3) - offset_narrowcanal: Cammino de remolcage de canal stricte - ok: OK - openchangeset: Aperi gruppo de modificationes - option_custompointers: Usar punctatores penna e mano - option_external: "Lanceamento externe:" - option_fadebackground: Attenuar fundo - option_layer_cycle_map: OSM - carta cyclista - option_layer_maplint: OSM - Maplint (errores) - option_layer_nearmap: "Australia: NearMap" - option_layer_ooc_25k: "RU historic: 1:25k" - option_layer_ooc_7th: "RU historic: 7me" - option_layer_ooc_npe: "RU historic: NPE" - option_layer_ooc_scotland: "RU historic: Scotia" - option_layer_os_streetview: "Regno Unite: OS StreetView" - option_layer_streets_haiti: "Haiti: nomines de stratas" - option_layer_surrey_air_survey: "Regno Unite: Surrey Air Survey" - option_layer_tip: Selige le fundo a monstrar - option_limitways: Advertir si multe datos debe esser cargate - option_microblog_id: "Nomine del microblog:" - option_microblog_pwd: "Contrasigno del microblog:" - option_noname: Mitter in evidentia le vias sin nomine - option_photo: "KML del photo:" - option_thinareas: Usar lineas plus fin pro areas - option_thinlines: Usa lineas fin a tote le scalas - option_tiger: Mitter in evidentia le datos TIGER non modificate - option_warnings: Monstrar advertimentos flottante - point: Puncto - preset_icon_airport: Aeroporto - preset_icon_bar: Bar - preset_icon_bus_stop: Halto de autobus - preset_icon_cafe: Café - preset_icon_cinema: Cinema - preset_icon_convenience: Boteca de convenientia - preset_icon_disaster: Edificio in Haiti - preset_icon_fast_food: Restauration rapide - preset_icon_ferry_terminal: Ferry - preset_icon_fire_station: Caserna de pumperos - preset_icon_hospital: Hospital - preset_icon_hotel: Hotel - preset_icon_museum: Museo - preset_icon_parking: Parking - preset_icon_pharmacy: Pharmacia - preset_icon_place_of_worship: Loco de adoration - preset_icon_police: Commissariato de policia - preset_icon_post_box: Cassa postal - preset_icon_pub: Taverna - preset_icon_recycling: Recyclage - preset_icon_restaurant: Restaurante - preset_icon_school: Schola - preset_icon_station: Station ferroviari - preset_icon_supermarket: Supermercato - preset_icon_taxi: Station de taxi - preset_icon_telephone: Telephono - preset_icon_theatre: Theatro - preset_tip: Seliger ex un menu de etiquettas predefinite que describe le $1 - prompt_addtorelation: Adder $1 a un relation - prompt_changesetcomment: "Entra un description de tu modificationes:" - prompt_closechangeset: Clauder gruppo de modificationes $1 - prompt_createparallel: Crear un via parallel - prompt_editlive: Modificar in directo - prompt_editsave: Modificar con salveguardar - prompt_helpavailable: Nove usator? Vide adjuta in basso a sinistra. - prompt_launch: Lancear URL externe - prompt_live: Con modification in directo, cata elemento que tu cambia essera salveguardate instanteemente in le base de datos de OpenStreetMap. Isto non es recommendate pro comenciantes. Es tu secur? - prompt_manyways: Iste area es multo detaliate e prendera multe tempore pro esser cargate. Prefere tu facer zoom avante? - prompt_microblog: Publicar in $1 (il remane $2) - prompt_revertversion: "Reverter a un version previemente salveguardate:" - prompt_savechanges: Salveguardar modificationes - prompt_taggedpoints: Alcunes del punctos in iste via ha etiquettas o relationes. Realmente deler? - prompt_track: Converter tracia GPS in vias - prompt_unlock: Clicca pro disblocar - prompt_welcome: Benvenite a OpenStreetMap! - retry: Reprobar - revert: Reverter - save: Salveguardar - tags_backtolist: Retornar al lista - tags_descriptions: Descriptiones de '$1' - tags_findatag: Cercar un etiquetta - tags_findtag: Cercar etiquetta - tags_matching: Etiquettas popular correspondente a '$1' - tags_typesearchterm: "Entra un parola a cercar:" - tip_addrelation: Adder a un relation - tip_addtag: Adder un nove etiquetta - tip_alert: Un error occurreva - clicca pro detalios - tip_anticlockwise: Via circular in senso antihorologic - clicca pro inverter - tip_clockwise: Via circular in senso horologic - clicca pro inverter - tip_direction: Direction del via - clicca pro inverter - tip_gps: Monstra tracias GPS (G) - tip_noundo: Nihil a disfacer - tip_options: Configurar optiones (seliger le fundo del carta) - tip_photo: Cargar photos - tip_presettype: Selige le typo de parametros predefinite a offerer in le menu. - tip_repeattag: Repeter le etiquettas del via previemente seligite (R) - tip_revertversion: Selige le data al qual reverter - tip_selectrelation: Adder al route seligite - tip_splitway: Divider le via al puncto seligite (X) - tip_tidy: Rangiar le punctos del via (T) - tip_undo: Disfacer $1 (Z) - uploading: Incargamento… - uploading_deleting_pois: Dele PDIs - uploading_deleting_ways: Dele vias - uploading_poi: Incarga PDI $1 - uploading_poi_name: Incarga PDI $1, $2 - uploading_relation: Incarga relation $1 - uploading_relation_name: Incarga relation $1, $2 - uploading_way: Incarga via $1 - uploading_way_name: Incargamento del via $1, $2 - warning: Attention! - way: Via - "yes": Si diff --git a/config/potlatch/locales/id.yml b/config/potlatch/locales/id.yml deleted file mode 100644 index ea1dbf4d1..000000000 --- a/config/potlatch/locales/id.yml +++ /dev/null @@ -1,182 +0,0 @@ -# Messages for Indonesian (Bahasa Indonesia) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Farras -# Author: Irwangatot -# Author: IvanLanin -# Author: Kenrick95 -# Author: Rodin -id: - a_poi: $1 adalah POI - a_way: $1 jalan - action_cancelchanges: membatalkan perubahan terhadap - action_changeway: mengubah ke jalan - action_createparallel: membuat jalan paralel - action_createpoi: membuat POI - action_deletepoint: menghapus sebuah titik - action_mergeways: menggabungkan dua jalan - action_movepoi: memindahkan POI - action_movepoint: memindahkan titik - action_moveway: memindahkan jalan - action_poitags: mengatur tag di POI - action_reverseway: mengembalikan jalan - action_revertway: mengembalikan jalan - action_splitway: memisah jalan - action_waytags: mengatur tag di jalan - advanced_history: Versi terdahulu jalan - advanced_maximise: Perbesar jendela - advanced_minimise: Perkecil jendela - advanced_parallel: Jalan paralel - advanced_tooltip: Langkah sunting lanjutan - advanced_undelete: Jangan hapus - advice_bendy: Terlalu melengkung untuk diluruskan (SHIFT untuk memaksa) - advice_deletingpoi: Menghapus POI (Z untuk batal) - advice_deletingway: Menghapus jalan (Z untuk batal) - advice_microblogged: Memperbarui status $1 Anda - advice_nocommonpoint: Jalan-jalan ini tidak menggunakan titik yang sama - advice_revertingpoi: Mengembalikan ke POI yang terakhir disimpan (Z untuk batal) - advice_revertingway: Mengembalikan ke jalan yang terakhir disimpan (Z untuk batal) - advice_tagconflict: Tag tidak ditemukan - silakan cek (Z untuk batal) - advice_uploadempty: Tidak ada yang diunggah - advice_uploadfail: Pengunggahan berhenti - advice_uploadsuccess: Semua data sukses diunggah - advice_waydragged: Jalan telah diubah (Z untuk batal) - cancel: Batal - conflict_download: Unduh versi mereka - conflict_overwrite: Ubah versi mereka - conflict_poichanged: Sejak Anda memulai penyuntingan, orang lain telah mengubah titik $1$2. - conflict_relchanged: Sejak Anda mulai menyunting, seseorang telah mengubah hubungan $1$2 - conflict_visitpoi: Klik 'Ok' untuk menampilkan titik. - conflict_visitway: Klik 'Ok' untuk menampilkan jalan. - conflict_waychanged: Sejak Anda mulai menyunting, seseorang telah mengubah jalan $1$2. - createrelation: Buat relasi baru - custom: "Kustom:" - delete: Hapus - deleting: menghapus - editinglive: Penyuntingan langsung - editingoffline: Penyuntingan luring - emailauthor: \n\nKirim surel ke richard\@systemeD.net dengan laporan bug, katakan apa yang Anda lakukan pada waktu itu. - error_anonymous: Anda tak dapat menghubungi pembuat peta anonim. - error_connectionfailed: Maaf - koneksi ke server OpenStreetMap gagal. Perubahan terkini apapun belum disimpan.\n\n\Apakah Anda ingin mencoba lagi? - error_readfailed: Maaf - server OpenStreetMap tidak merespon ketika dimintai data.\n\n\Apakah Anda ingin mencoba lagi? - existingrelation: Tambahkan ke hubungan yang telah ada - findrelation: Temukan hubungan yang berisi - gpxpleasewait: Mohon menunggu sementara jalur GPX sedang diproses. - heading_introduction: Perkenalan - heading_pois: Perkenalan - heading_quickref: Referensi cepat - heading_surveying: Mensurvei - heading_tagging: Penanda - heading_troubleshooting: Memperbaiki - help: Bantuan - help_html: "Selamat datang di Potlatch\nPotlatch merupakan penyunting yang mudah-di-gunakan untuk OpenStreetMap. Mengambar jalan, jejak, tandajalan dan belanja untuk survey GPS, gambar satelit atau peta lama.\n\nHalaman pertolongan ini akan mengantar anda melalui penggunaan mendasar Potlatch, dan menunjukan anda kemana untuk mendapatkan lebih. Klik judul berikut untuk memulai.\n\nKetika anda sudah selesai, klik dimana saja pada halaman.\n\n\n\nBarang berguna untuk diketahui\nJangan menyalin dari peta yang lain!\n\nIf you choose 'Edit live', any changes you make will go into the database as you draw them - like, immediately. If you're not so confident, choose 'Edit with save', and they'll only go in when you press 'Save'.\n\nAny edits you make will usually be shown on the map after an hour or two (a few things take a week). Not everything is shown on the map - it would look too messy. But because OpenStreetMap's data is open source, other people are free to make maps showing different aspects - like OpenCycleMap or Midnight Commander.\n\nRemember it's both a good-looking map (so draw pretty curves for bends) and a diagram (so make sure roads join at junctions).\n\nApakah kami menyinggun untuk tidak menyalin dari peta lain?\n\n\nKetahui lebih banyak\nPotlatch manual\nMailing lists\nOnline chat (live help)\nForum web\nKomunitas wiki\nKode sumber Potlatch\n\n\n\nMemulai\nSekarang anda telah membuka Potlatch, klik 'Sunting dengan menyimpan' untuk memulai.\n\nJadi, Anda siap untuk menggambar peta. Paling mudah untuk memulainya adalah dengan meletakkan beberapa tempat menarik di peta - atau \"POI\". Mungkin ini pub, gereja, stasiun kereta api ... apa pun yang Anda suka.\n\nSeret dan letakan\nTo make it super-easy, you'll see a selection of the most common POIs, right at the bottom of the map for you. Putting one on the map is as easy as dragging it from there onto the right place on the map. And don't worry if you don't get the position right first time: you can drag it again until it's right. Note that the POI is highlighted in yellow to show that it's selected.\n\nOnce you've done that, you'll want to give your pub (or church, or station) a name. You'll see that a little table has appeared at the bottom. One of the entries will say \"name\" followed by \"(type name here)\". Do that - click that text, and type the name.\n\nClick somewhere else on the map to deselect your POI, and the colourful little panel returns.\n\nEasy, isn't it? Click 'Save' (bottom right) when you're done.\nBergerak memutar\nTo move to a different part of the map, just drag an empty area. Potlatch will automatically load the new data (look at the top right).\n\nWe told you to 'Edit with save', but you can also click 'Edit live'. If you do this, your changes will go into the database straightaway, so there's no 'Save' button. This is good for quick changes and mapping parties.\n\nLangkah berikutnya\nHappy with all of that? Great. Click 'Surveying' above to find out how to become a real mapper!\n\nSurvei menggunakan GPS\nThe idea behind OpenStreetMap is to make a map without the restrictive copyright of other maps. This means you can't copy from elsewhere: you must go and survey the streets yourself. Fortunately, it's lots of fun!\nThe best way to do this is with a handheld GPS set. Find an area that isn't mapped yet, then walk or cycle up the streets with your GPS switched on. Note the street names, and anything else interesting (pubs? churches?) , as you go along.\n\nWhen you get home, your GPS will contain a 'tracklog' recording everywhere you've been. You can then upload this to OpenStreetMap.\n\nThe best type of GPS is one that records to the tracklog frequently (every second or two) and has a big memory. Lots of our mappers use handheld Garmins or little Bluetooth units. There are detailed GPS Reviews on our wiki.\n\nUnggah jalur anda\nNow, you need to get your track off the GPS set. Maybe your GPS came with some software, or maybe it lets you copy the files off via USB. If not, try GPSBabel. Whatever, you want the file to be in GPX format.\n\nThen use the 'GPS Traces' tab to upload your track to OpenStreetMap. But this is only the first bit - it won't appear on the map yet. You must draw and name the roads yourself, using the track as a guide.\nMenggunakan jejak anda\nFind your uploaded track in the 'GPS Traces' listing, and click 'edit' right next to it. Potlatch will start with this track loaded, plus any waypoints. You're ready to draw!\n\nYou can also click this button to show everyone's GPS tracks (but not waypoints) for the current area. Hold Shift to show just your tracks.\nMenggunakan foto satelit\nIf you don't have a GPS, don't worry. In some cities, we have satellite photos you can trace over, kindly supplied by Yahoo! (thanks!). Go out and note the street names, then come back and trace over the lines.\n\nIf you don't see the satellite imagery, click the options button and make sure 'Yahoo!' is selected. If you still don't see it, it's probably not available for your city, or you might need to zoom out a bit.\n\nOn this same options button you'll find a few other choices like an out-of-copyright map of the UK, and OpenTopoMap for the US. These are all specially selected because we're allowed to use them - don't copy from anyone else's maps or aerial photos. (Copyright law sucks.)\n\nSometimes satellite pics are a bit displaced from where the roads really are. If you find this, hold Space and drag the background until it lines up. Always trust GPS tracks over satellite pics.\n\nCara menggambar\nTo draw a road (or 'way') starting at a blank space on the map, just click there; then at each point on the road in turn. When you've finished, double-click or press Enter - then click somewhere else to deselect the road.\n\nTo draw a way starting from another way, click that road to select it; its points will appear red. Hold Shift and click one of them to start a new way at that point. (If there's no red point at the junction, shift-click where you want one!)\n\nKlik 'Simpan' (tombol kanan) ketika anda selesai. Simpan sesering mungkin, jikalau peladen dalam masalah.\n\nJangan berharap perubahan anda akan di tampilkan seketika pada peta utama. Biasanya sampai satu atau dua jam, kadang-kadang sampai satu minggu.\nMembuat persimpangan\nIt's really important that, where two roads join, they share a point (or 'node'). Route-planners use this to know where to turn.\n\nPotlatch takes care of this as long as you are careful to click exactly on the way you're joining. Look for the helpful signs: the points light up blue, the pointer changes, and when you're done, the junction point has a black outline.\nMengerakan dan menghapus\nThis works just as you'd expect it to. To delete a point, select it and press Delete. To delete a whole way, press Shift-Delete.\n\nTo move something, just drag it. (You'll have to click and hold for a short while before dragging a way, so you don't do it by accident.)\nLebih lanjutan dalam menggambar\nIf two parts of a way have different names, you'll need to split them. Click the way; then click the point where it should be split, and click the scissors. (You can merge ways by clicking with Control, or the Apple key on a Mac, but don't merge two roads of different names or types.)\n\nRoundabouts are really hard to draw right. Don't worry - Potlatch can help. Just draw the loop roughly, making sure it joins back on itself at the end, then click this icon to 'tidy' it. (You can also use this to straighten out roads.)\nTempat yang disukai\nThe first thing you learned was how to drag-and-drop a point of interest. You can also create one by double-clicking on the map: a green circle appears. But how to say whether it's a pub, a church or what? Click 'Tagging' above to find out!\n\nApa jenis jalan nya?\nOnce you've drawn a way, you should say what it is. Is it a major road, a footpath or a river? What's its name? Are there any special rules (e.g. \"no bicycles\")?\n\nIn OpenStreetMap, you record this using 'tags'. A tag has two parts, and you can have as many as you like. For example, you could add highway | trunk to say it's a major road; highway | residential for a road on a housing estate; or highway | footway for a footpath. If bikes were banned, you could then add bicycle | no. Then to record its name, add name | Market Street.\n\nThe tags in Potlatch appear at the bottom of the screen - click an existing road, and you'll see what tags it has. Click the '+' sign (bottom right) to add a new tag. The 'x' by each tag deletes it.\n\nYou can tag whole ways; points in ways (maybe a gate or a traffic light); and points of interest.\nUsing preset tags\nTo get you started, Potlatch has ready-made presets containing the most popular tags.\n\nSelect a way, then click through the symbols until you find a suitable one. Then, choose the most appropriate option from the menu.\n\nThis will fill the tags in. Some will be left partly blank so you can type in (for example) the road name and number.\nJalan satu-arah\nYou might want to add a tag like oneway | yes - but how do you say which direction? There's an arrow in the bottom left that shows the way's direction, from start to end. Click it to reverse.\nPilih penanda anda sendiri\nOf course, you're not restricted to just the presets. By using the '+' button, you can use any tags at all.\n\nYou can see what tags other people use at OSMdoc, and there is a long list of popular tags on our wiki called Map Features. But these are only suggestions, not rules. You are free to invent your own tags or borrow from others.\n\nBecause OpenStreetMap data is used to make many different maps, each map will show (or 'render') its own choice of tags.\nHubungan\nSometimes tags aren't enough, and you need to 'group' two or more ways. Maybe a turn is banned from one road into another, or 20 ways together make up a signed cycle route. You can do this with an advanced feature called 'relations'. Find out more on the wiki.\n\nMembatalkan kesalahan\nIni adalah tombol batal (anda dapat memijit Z) - akan membatalkan apa yang terakhir anda lakukan.\n\nYou can 'revert' to a previously saved version of a way or point. Select it, then click its ID (the number at the bottom left) - or press H (for 'history'). You'll see a list of everyone who's edited it, and when. Choose the one to go back to, and click Revert.\n\nIf you've accidentally deleted a way and saved it, press U (for 'undelete'). All the deleted ways will be shown. Choose the one you want; unlock it by clicking the red padlock; and save as usual.\n\nThink someone else has made a mistake? Send them a friendly message. Use the history option (H) to select their name, then click 'Mail'.\n\nUse the Inspector (in the 'Advanced' menu) for helpful information about the current way or point.\nFAQs\nHow do I see my waypoints?\nWaypoints only show up if you click 'edit' by the track name in 'GPS Traces'. The file has to have both waypoints and tracklog in it - the server rejects anything with waypoints alone.\n\nMore FAQs for Potlatch and OpenStreetMap.\n\n\n\nWorking faster\nThe further out you're zoomed, the more data Potlatch has to load. Zoom in before clicking 'Edit'.\n\nTurn off 'Use pen and hand pointers' (in the options window) for maximum speed.\n\nIf the server is running slowly, come back later. Check the wiki for known problems. Some times, like Sunday evenings, are always busy.\n\nTell Potlatch to memorise your favourite sets of tags. Select a way or point with those tags, then press Ctrl, Shift and a number from 1 to 9. Then, to apply those tags again, just press Shift and that number. (They'll be remembered every time you use Potlatch on this computer.)\n\nTurn your GPS track into a way by finding it in the 'GPS Traces' list, clicking 'edit' by it, then tick the 'convert' box. It'll be locked (red) so won't save. Edit it first, then click the red padlock to unlock when ready to save.\n\nWhat to click\nDrag the map to move around.\nDouble-click to create a new POI.\nSingle-click to start a new way.\nHold and drag a way or POI to move it.\nWhen drawing a way\nDouble-click or press Enter to finish drawing.\nClick another way to make a junction.\nShift-click the end of another way to merge.\nWhen a way is selected\nClick a point to select it.\nShift-click in the way to insert a new point.\nShift-click a point to start a new way from there.\nControl-click another way to merge.\n\nKeyboard shortcuts\nB Add background source tag\nC Close changeset\nG Show GPS tracks\nH Show history\nI Show inspector\nJ Join point to what's below ways\n(+Shift) Unjoin from other ways\nK Lock/unlock current selection\nL Show current latitude/longitude\nM Maximise editing window\nP Create parallel way\nR Repeat tags\nS Save (unless editing live)\nT Tidy into straight line/circle\nU Undelete (show deleted ways)\nX Cut way in two\nZ Undo\n- Hapus titik dari jalan ini saja\n+ Menambah tanda baru\n/ Select another way sharing this point\nDelete Hapus titik\n (+Shift) Hapus semua jalan\nReturn Selesai menggambar jalan\nSpace Hold and drag background\nEsc Abort this edit; reload from server\n0 Hilangkan semua penanda\n1-9 Select preset tags\n (+Shift) Select memorised tags\n (+S/Ctrl) Memorise tags\n§ or ` Cycle between tag groups\n\n" - hint_latlon: "lintang $1\nbujur $2" - hint_loading: memuat data - hint_saving: menyimpan data - hint_saving_loading: memuat/menyimpan data - inspector: Inspektur - inspector_duplicate: Duplikat dari - inspector_latlon: "Lintang $1\nBujur $2" - inspector_locked: Terkunci - inspector_node_count: ($1 kali) - inspector_unsaved: Tidak tersimpan - inspector_uploading: (mengunggah) - login_pwd: "Kata kunci:" - login_retry: Masuk log Anda tidak dikenali. Coba lagi. - login_title: Tidak dapat masuk log - login_uid: "Nama pengguna:" - mail: Surat - more: Lebih banyak - "no": Tidak - nobackground: Tidak ada latarbelakan - norelations: Tidak ada hubungan di daerah ini - offset_broadcanal: Pinggiran kanal lebar - offset_dual: Jalan dua arah (D2) - offset_motorway: Motorway (D3) - offset_narrowcanal: Pinggiran kanal sempit - ok: Ok - option_layer_cycle_map: OSM - peta siklus - option_layer_maplint: OSM - Maplint (kesalahan) - option_layer_nearmap: "Australia: NearMap" - option_layer_tip: Pilih latar belakang untuk ditampilkan - option_limitways: Peringatkan ketika memuat banyak data - option_microblog_id: "Nama blog mikro:" - option_microblog_pwd: "Kata sandi blog mikro:" - option_noname: Sorot jalan yang belum dinamai - option_photo: "KML Foto:" - option_thinareas: Gunakan garis yang lebih tipis untuk daerah - option_thinlines: Gunakan garis tipis untuk semua skala - option_warnings: Tampilkan peringatan melayang - point: Titik - preset_icon_airport: Bandar udara - preset_icon_bar: Bar - preset_icon_bus_stop: Pemberhentian Bus - preset_icon_cafe: Kafe - preset_icon_cinema: Bioskop - preset_icon_convenience: Toko swalayan - preset_icon_fast_food: Restoran cepat saji - preset_icon_ferry_terminal: Feri - preset_icon_fire_station: Pos pemadam kebakaran - preset_icon_hospital: Rumah sakit - preset_icon_hotel: Penginapan - preset_icon_museum: Musium - preset_icon_parking: Lapangan parkir - preset_icon_pharmacy: Apotek - preset_icon_place_of_worship: Tempat ibadah - preset_icon_police: Kantor polisi - preset_icon_post_box: Kotak pos - preset_icon_pub: Pub - preset_icon_recycling: Tempat sampah - preset_icon_restaurant: Restoran - preset_icon_school: Sekolah - preset_icon_station: Stasiun kereta - preset_icon_supermarket: Sualayan - preset_icon_taxi: Tempat tunggu taksi - preset_icon_telephone: Telepon - preset_icon_theatre: Teater - prompt_addtorelation: Tambahkan $1 ke hubungan - prompt_changesetcomment: "Masukkan keterangan tentang perubahan yang Anda lakukan:" - prompt_createparallel: Buat jalur paralel - prompt_editlive: Sunting langsung - prompt_editsave: Sunting dengan simpan - prompt_helpavailable: Pengguna baru? Periksa bagian kiri bawah untuk bantuan. - prompt_launch: Buka URL luar - prompt_live: Dalam mode langsung, setiap bagian yang Anda ubah akan disimpan di pusat data OpenStreetMap secara langsung- tidak disarankan untuk pemula. Apakah Anda yakin? - prompt_revertversion: "Kembalikan ke versi simpan sebelumnya:" - prompt_savechanges: Simpan perubahan - prompt_taggedpoints: Sejumlah titik di jalan ini diberi tag. Anda yakin ingin menghapus? - prompt_track: Ubah jalur GPS menjadi jalan - prompt_unlock: Klik untuk membuka - prompt_welcome: Selamat Datang di OpenStreetMap! - retry: Cobalagi - revert: Kembalikan - save: Simpan - tags_descriptions: Deskripsi dari '$1' - tags_findtag: Temukan tag - tip_addrelation: Tambahkan ke hubungan - tip_addtag: Tambah tag baru - tip_alert: Kesalahan terjadi - klik untuk lebih lanjut - tip_anticlockwise: Jalan sirkuler berlawanan jarum jam - klik untuk mengembalikan - tip_clockwise: Jalan sirkuler searah jarum jam - klik untuk mengembalikan - tip_direction: Arah jalan - klik untuk arah berlawanan - tip_gps: Perlihatkan jejak GPS (G) - tip_noundo: Tidak ada yang bisa dibatalkan - tip_options: Atur pilihan (pilih latar belakang peta) - tip_photo: Muat foto - tip_repeattag: Ulang tag dari jalan yang dipilih sebelumnya (R) - tip_revertversion: Pilih tanggal yang akan dikembalikan - tip_selectrelation: Tambahkan ke rute yang dipilih - tip_splitway: Pisah jalan di titik yang dipilih (X) - tip_undo: Batalkan $1 (Z) - uploading: Mengunggah... - uploading_deleting_pois: Menghapus POI - uploading_deleting_ways: Hapus jalan - uploading_poi: Mengunggah POI $1 - uploading_poi_name: Mengunggah POI $1, $2 - uploading_relation: Mengunggah hubungan $1 - uploading_relation_name: Mengunggah hubungan $1, $2 - uploading_way: Mengunggah jalan $1 - uploading_way_name: Mengunggah jalan $1, $2 - warning: Peringatan! - way: Jalan - "yes": Ya diff --git a/config/potlatch/locales/is.yml b/config/potlatch/locales/is.yml deleted file mode 100644 index de5913ea0..000000000 --- a/config/potlatch/locales/is.yml +++ /dev/null @@ -1,230 +0,0 @@ -# Messages for Icelandic (Íslenska) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Ævar Arnfjörð Bjarmason -is: - a_poi: $1 hnút - a_way: $1 veg - action_addpoint: að bæta hnút við endan á veg - action_cancelchanges: tek aftur breytingar á - action_changeway: breytingar á veg - action_createparallel: að búa til samhliða vegi - action_createpoi: að bæta við hnút - action_deletepoint: að eyða hnút - action_insertnode: að bæta við hnút við veg - action_mergeways: sameiningu tveggja vega - action_movepoi: að færa hnút - action_movepoint: að færa punkt - action_moveway: að færa veg - action_pointtags: að bæta eigindum við hnút - action_poitags: að bæta eigindum við hnút - action_reverseway: að breyta átt vegar - action_revertway: að breyta veg til fyrri útgáfu - action_splitway: að skipta vegi - action_waytags: að bæta eigindum við veg - advanced: Tólastika - advanced_close: Loka breytingarsetti - advanced_history: Breytingaskrá vegs - advanced_inspector: Gagnasýn - advanced_maximise: Stækka ritilinn - advanced_minimise: Minnka ritilinn - advanced_parallel: Búa til samhliða veg - advanced_tooltip: Ýmis tól í ritlinum - advanced_undelete: Taka aftur eyðingu - advice_bendy: Vegurinn er of beygður til að rétta úr honum (haltu niðri SHIFT til að neyða þetta í gegn) - advice_conflict: Breytingarárekstur - þú gætir þurft að vista aftur - advice_deletingpoi: Eyði hnút (Z til að taka aftur) - advice_deletingway: Eyði veg (Z til að taka aftur) - advice_microblogged: Uppfærði stöðu þína á $1 - advice_nocommonpoint: Vegirnir eiga ekki sameiginlegan punkt - advice_revertingpoi: Tek aftur til síðasta vistaða hnút (Z til að taka aftur) - advice_revertingway: Tek aftur til síðustu vistuðu útgáfu (Z til að taka aftur) - advice_tagconflict: Eigindi passa ekki - vinsamlegast athugaðu (Z til að taka aftur) - advice_toolong: Of langur til að aflæsa - skiptu upp í styttri vegi - advice_uploadempty: Breyttu einhverju fyrst - advice_uploadfail: Ekki tókst að hlaða upp - advice_uploadsuccess: Breytingum var hlaðið upp - advice_waydragged: Vegur færður (Z til að taka aftur) - cancel: Hætta við - closechangeset: Loka breytingarsetti - conflict_download: Hala niður þeirra útgáfu - conflict_overwrite: Yfirskrifa þeirra útgáfu - conflict_poichanged: Einhver hefur breytt hnúti $1$2 síðan þú byrjaðir að breyta. - conflict_relchanged: Einhver hefur breytt venslum $1$2 síðan þú byrjaðir að breyta. - conflict_visitpoi: Smelltu á „Ok“ til að sýna hnútinn. - conflict_visitway: Smelltu á „Ok“ til að sýna veginn. - conflict_waychanged: Einhver hefur breytt vegi $1$2 síðan þú byrjaðir að breyta. - createrelation: Búa til ný vensl - custom: "Annar:" - delete: Eyða - deleting: að eyða - drag_pois: Dragðu hnúta úr listanum til að bæta þeim á kortið - editinglive: Breyti beint - editingoffline: Breyti með vistun - emailauthor: \n\nSendu póst til richard\@systemD.net með villutilkynningu og lýstu því sem þú varst að gera þegar villan kom upp. - error_anonymous: Þú getur ekki haft samband við ónafngreindan notanda. - error_connectionfailed: Tengingin við OpenStreetMap þjóninn rofnaði. Nýlegar breytingar hafa ekki verið vistaðar.\n\nViltu reyna aftur? - error_microblog_long: "Ekki tókst að babla á $1:\nHTTP kóði: $1\nVilluskilaboð: $3\nVilla frá $1: $4" - error_nopoi: Hnúturinn fannst ekki (ertu búinn að þysja í burtu?). Get ekki tekið aftur. - error_nosharedpoint: Vegir $1 og $2 eiga ekki sameiginlegan punkt lengur, þannig ekki er hægt að taka aftur skiptingu á þeim. - error_noway: Vegur $1 fannst ekki (kannski hefuru þysjað burt?). Ég get ekki tekið aftur. - error_readfailed: Aðspurður um gögn svaraði OpenStreetMap þjónninn ekki.\n\nViltu reyna aftur? - existingrelation: Bæta við í vensl sem eru þegar til - findrelation: Finna vensl sem innihalda - gpxpleasewait: Bíddu meðan unnið er úr GPX ferlinum. - heading_drawing: Teiknun - heading_introduction: Kynning - heading_pois: Að byrja - heading_quickref: Að nota ritilinn - heading_surveying: Mælingar - heading_tagging: Eigindi - heading_troubleshooting: Algeng vandamál - help: Hjálp - help_html: "Velkomin(n) í Potlatch\nPotlatch er einfaldur ritill fyrir OpenStreetMap. Þú getur teiknað vegi, stíga, verslanir og annað upp úr GPS ferlum, gervihnattamyndum eða gömlum kortum.\n\nÍ þessari hjálp verður notkun Potlatch útskýrð og bent á hvar er hægt að fá frekari hálp. Smelltu á einhverja fyrirsögn efst á síðunni til að byrja.\n\nSmelltu utan hjálpargluggans til að loka honum.\n\n\n\nGott að vita\nEkki afrita gögn frá öðrum kortum!\n\nEf þú velur „Breyta beint“ þegar þú ræsir Potlatch munu allar breytingar þínar vera vistaðar um leið og þú gerir þær, veldu „Breyta með vistun“ ef það veldur þér áhyggjum, þá eru breytingarnar þínar aðeins vistaðar þegar þú velur „Vista“.\n\nAny edits you make will usually be shown on the map after an hour or two (a few things take a week). Not everything is shown on the map - it would look too messy. But because OpenStreetMap's data is open source, other people are free to make maps showing different aspects - like OpenCycleMap or Midnight Commander.\n\nRemember it's both a good-looking map (so draw pretty curves for bends) and a diagram (so make sure roads join at junctions).\n\nDid we mention about not copying from other maps?\n\n\nFrekari upplýsingar\nPotlatch manual\nMailing lists\nOnline chat (live help)\nWeb forum\nCommunity wiki\nPotlatch source-code\n\n\n\nGetting started\nNow that you have Potlatch open, click 'Edit with save' to get started.\n\nSo you're ready to draw a map. The easiest place to start is by putting some points of interest on the map - or \"POIs\". These might be pubs, churches, railway stations... anything you like.\n\nDrag and drop\nTo make it super-easy, you'll see a selection of the most common POIs, right at the bottom of the map for you. Putting one on the map is as easy as dragging it from there onto the right place on the map. And don't worry if you don't get the position right first time: you can drag it again until it's right. Note that the POI is highlighted in yellow to show that it's selected.\n\nOnce you've done that, you'll want to give your pub (or church, or station) a name. You'll see that a little table has appeared at the bottom. One of the entries will say \"name\" followed by \"(type name here)\". Do that - click that text, and type the name.\n\nClick somewhere else on the map to deselect your POI, and the colourful little panel returns.\n\nEasy, isn't it? Click 'Save' (bottom right) when you're done.\nMoving around\nTo move to a different part of the map, just drag an empty area. Potlatch will automatically load the new data (look at the top right).\n\nWe told you to 'Edit with save', but you can also click 'Edit live'. If you do this, your changes will go into the database straightaway, so there's no 'Save' button. This is good for quick changes and mapping parties.\n\nNext steps\nHappy with all of that? Great. Click 'Surveying' above to find out how to become a real mapper!\n\nSurveying with a GPS\nThe idea behind OpenStreetMap is to make a map without the restrictive copyright of other maps. This means you can't copy from elsewhere: you must go and survey the streets yourself. Fortunately, it's lots of fun!\nThe best way to do this is with a handheld GPS set. Find an area that isn't mapped yet, then walk or cycle up the streets with your GPS switched on. Note the street names, and anything else interesting (pubs? churches?) , as you go along.\n\nWhen you get home, your GPS will contain a 'tracklog' recording everywhere you've been. You can then upload this to OpenStreetMap.\n\nThe best type of GPS is one that records to the tracklog frequently (every second or two) and has a big memory. Lots of our mappers use handheld Garmins or little Bluetooth units. There are detailed GPS Reviews on our wiki.\n\nUploading your track\nNow, you need to get your track off the GPS set. Maybe your GPS came with some software, or maybe it lets you copy the files off via USB. If not, try GPSBabel. Whatever, you want the file to be in GPX format.\n\nThen use the 'GPS Traces' tab to upload your track to OpenStreetMap. But this is only the first bit - it won't appear on the map yet. You must draw and name the roads yourself, using the track as a guide.\nUsing your track\nFind your uploaded track in the 'GPS Traces' listing, and click 'edit' right next to it. Potlatch will start with this track loaded, plus any waypoints. You're ready to draw!\n\nYou can also click this button to show everyone's GPS tracks (but not waypoints) for the current area. Hold Shift to show just your tracks.\nUsing satellite photos\nIf you don't have a GPS, don't worry. In some cities, we have satellite photos you can trace over, kindly supplied by Yahoo! (thanks!). Go out and note the street names, then come back and trace over the lines.\n\nIf you don't see the satellite imagery, click the options button and make sure 'Yahoo!' is selected. If you still don't see it, it's probably not available for your city, or you might need to zoom out a bit.\n\nOn this same options button you'll find a few other choices like an out-of-copyright map of the UK, and OpenTopoMap for the US. These are all specially selected because we're allowed to use them - don't copy from anyone else's maps or aerial photos. (Copyright law sucks.)\n\nSometimes satellite pics are a bit displaced from where the roads really are. If you find this, hold Space and drag the background until it lines up. Always trust GPS tracks over satellite pics.\n\nDrawing ways\nTo draw a road (or 'way') starting at a blank space on the map, just click there; then at each point on the road in turn. When you've finished, double-click or press Enter - then click somewhere else to deselect the road.\n\nTo draw a way starting from another way, click that road to select it; its points will appear red. Hold Shift and click one of them to start a new way at that point. (If there's no red point at the junction, shift-click where you want one!)\n\nClick 'Save' (bottom right) when you're done. Save often, in case the server has problems.\n\nDon't expect your changes to show instantly on the main map. It usually takes an hour or two, sometimes up to a week.\nMaking junctions\nIt's really important that, where two roads join, they share a point (or 'node'). Route-planners use this to know where to turn.\n\nPotlatch takes care of this as long as you are careful to click exactly on the way you're joining. Look for the helpful signs: the points light up blue, the pointer changes, and when you're done, the junction point has a black outline.\nMoving and deleting\nThis works just as you'd expect it to. To delete a point, select it and press Delete. To delete a whole way, press Shift-Delete.\n\nTo move something, just drag it. (You'll have to click and hold for a short while before dragging a way, so you don't do it by accident.)\nMore advanced drawing\nIf two parts of a way have different names, you'll need to split them. Click the way; then click the point where it should be split, and click the scissors. (You can merge ways by clicking with Control, or the Apple key on a Mac, but don't merge two roads of different names or types.)\n\nRoundabouts are really hard to draw right. Don't worry - Potlatch can help. Just draw the loop roughly, making sure it joins back on itself at the end, then click this icon to 'tidy' it. (You can also use this to straighten out roads.)\nPoints of interest\nThe first thing you learned was how to drag-and-drop a point of interest. You can also create one by double-clicking on the map: a green circle appears. But how to say whether it's a pub, a church or what? Click 'Tagging' above to find out!\n\nWhat type of road is it?\nOnce you've drawn a way, you should say what it is. Is it a major road, a footpath or a river? What's its name? Are there any special rules (e.g. \"no bicycles\")?\n\nIn OpenStreetMap, you record this using 'tags'. A tag has two parts, and you can have as many as you like. For example, you could add highway | trunk to say it's a major road; highway | residential for a road on a housing estate; or highway | footway for a footpath. If bikes were banned, you could then add bicycle | no. Then to record its name, add name | Market Street.\n\nThe tags in Potlatch appear at the bottom of the screen - click an existing road, and you'll see what tags it has. Click the '+' sign (bottom right) to add a new tag. The 'x' by each tag deletes it.\n\nYou can tag whole ways; points in ways (maybe a gate or a traffic light); and points of interest.\nUsing preset tags\nTo get you started, Potlatch has ready-made presets containing the most popular tags.\n\nSelect a way, then click through the symbols until you find a suitable one. Then, choose the most appropriate option from the menu.\n\nThis will fill the tags in. Some will be left partly blank so you can type in (for example) the road name and number.\nOne-way roads\nYou might want to add a tag like oneway | yes - but how do you say which direction? There's an arrow in the bottom left that shows the way's direction, from start to end. Click it to reverse.\nChoosing your own tags\nOf course, you're not restricted to just the presets. By using the '+' button, you can use any tags at all.\n\nYou can see what tags other people use at OSMdoc, and there is a long list of popular tags on our wiki called Map Features. But these are only suggestions, not rules. You are free to invent your own tags or borrow from others.\n\nBecause OpenStreetMap data is used to make many different maps, each map will show (or 'render') its own choice of tags.\nRelations\nSometimes tags aren't enough, and you need to 'group' two or more ways. Maybe a turn is banned from one road into another, or 20 ways together make up a signed cycle route. You can do this with an advanced feature called 'relations'. Find out more on the wiki.\n\nUndoing mistakes\nThis is the undo button (you can also press Z) - it will undo the last thing you did.\n\nYou can 'revert' to a previously saved version of a way or point. Select it, then click its ID (the number at the bottom left) - or press H (for 'history'). You'll see a list of everyone who's edited it, and when. Choose the one to go back to, and click Revert.\n\nIf you've accidentally deleted a way and saved it, press U (for 'undelete'). All the deleted ways will be shown. Choose the one you want; unlock it by clicking the red padlock; and save as usual.\n\nThink someone else has made a mistake? Send them a friendly message. Use the history option (H) to select their name, then click 'Mail'.\n\nUse the Inspector (in the 'Advanced' menu) for helpful information about the current way or point.\nFAQs\nHow do I see my waypoints?\nWaypoints only show up if you click 'edit' by the track name in 'GPS Traces'. The file has to have both waypoints and tracklog in it - the server rejects anything with waypoints alone.\n\nMore FAQs for Potlatch and OpenStreetMap.\n\n\n\nWorking faster\nThe further out you're zoomed, the more data Potlatch has to load. Zoom in before clicking 'Edit'.\n\nTurn off 'Use pen and hand pointers' (in the options window) for maximum speed.\n\nIf the server is running slowly, come back later. Check the wiki for known problems. Some times, like Sunday evenings, are always busy.\n\nTell Potlatch to memorise your favourite sets of tags. Select a way or point with those tags, then press Ctrl, Shift and a number from 1 to 9. Then, to apply those tags again, just press Shift and that number. (They'll be remembered every time you use Potlatch on this computer.)\n\nTurn your GPS track into a way by finding it in the 'GPS Traces' list, clicking 'edit' by it, then tick the 'convert' box. It'll be locked (red) so won't save. Edit it first, then click the red padlock to unlock when ready to save.\n\nWhat to click\nDrag the map to move around.\nDouble-click to create a new POI.\nSingle-click to start a new way.\nHold and drag a way or POI to move it.\nWhen drawing a way\nDouble-click or press Enter to finish drawing.\nClick another way to make a junction.\nShift-click the end of another way to merge.\nWhen a way is selected\nClick a point to select it.\nShift-click in the way to insert a new point.\nShift-click a point to start a new way from there.\nControl-click another way to merge.\n\nKeyboard shortcuts\nB Add background source tag\nC Close changeset\nG Show GPS tracks\nH Show history\nI Show inspector\nJ Join point to what's below ways\n(+Shift) Unjoin from other ways\nK Lock/unlock current selection\nL Show current latitude/longitude\nM Maximise editing window\nP Create parallel way\nR Repeat tags\nS Save (unless editing live)\nT Tidy into straight line/circle\nU Undelete (show deleted ways)\nX Cut way in two\nZ Undo\n- Remove point from this way only\n+ Add new tag\n/ Select another way sharing this point\nDelete Delete point\n (+Shift) Delete entire way\nReturn Finish drawing line\nSpace Hold and drag background\nEsc Abort this edit; reload from server\n0 Remove all tags\n1-9 Select preset tags\n (+Shift) Select memorised tags\n (+S/Ctrl) Memorise tags\n§ or ` Cycle between tag groups\n\n" - hint_drawmode: smelltu til að bæta við punkt\ntvísmelltu/ýttu á Enter\ntil að klára línu - hint_latlon: "lengdargráða $1\nbreiddargráða $2" - hint_loading: næ í gögn - hint_overendpoint: Yfir endapunkti ($1)\nsmelltu til að tengja\nshift-smelltu til að sameina - hint_overpoint: Yfir punkta ($1)\nsmelltu til að sameina - hint_pointselected: hnútur valinn\n(ýttu á shift og músahnappinn\ntil að teikna nýjan veg) - hint_saving: vista gögn - hint_saving_loading: hleð inn gögnum / vista gögn - inspector: Gagnasýn - inspector_duplicate: tvítekur - inspector_in_ways: Í vegunum - inspector_latlon: "Lengdargráða $1\nBreiddargráða $2" - inspector_locked: Læst - inspector_node_count: ($1 sinnum) - inspector_not_in_any_ways: Ekki í neinum vegum (hnútur) - inspector_unsaved: Óvistaður - inspector_uploading: (hleð upp) - inspector_way_connects_to: Tengdur við $1 vegi - inspector_way_connects_to_principal: Tengist við $1 „$2“ og $3 annan „$4“ - inspector_way_nodes: $1 hnútar - inspector_way_nodes_closed: $1 hnútar (lokaður) - loading: Næ í gögn... - login_pwd: "Lykilorð:" - login_retry: Innskráningin þín var ekki þekkt. Reyndu aftur. - login_title: Gat ekki skráð þig inn - login_uid: "Notandanafn:" - mail: Póstur - more: Meira - newchangeset: "Vinsamlegast reyndu aftur: Potlatch mun opna nýtt breytingarsett." - "no": Nei - nobackground: Enginn bakgrunnur - norelations: Engin vensl á þessu svæði - offset_broadcanal: Vegir sitthvorum megin við bæjarsýki - offset_choose: Veldu hliðrun (m) - offset_dual: Aðskyldur vegur (D2) - offset_motorway: Hraðbraut (D3) - offset_narrowcanal: Vegur báðum meginn við bæjarsýki - ok: ok - openchangeset: Opna breytingarsett - option_custompointers: Penni og hönd sem músartákn - option_external: "Ytri slóð:" - option_fadebackground: Deyfa bakgrunn - option_layer_cycle_map: OSM - Hjólakort - option_layer_maplint: OSM - Villulag - option_layer_mapnik: OSM - Aðalkort - option_layer_nearmap: "Ástralía: NearMap" - option_layer_ooc_25k: "Bretland: 1:25k kort" - option_layer_ooc_7th: "Bretland: 7th kort" - option_layer_ooc_npe: "Bretland: NPE kort" - option_layer_ooc_scotland: "Gamalt breskt: Skotland" - option_layer_os_streetview: "Bretland: OS StreetView" - option_layer_streets_haiti: "Haítí: Götunöfn" - option_layer_surrey_air_survey: "Bretland: Surrey Air Survey" - option_layer_tip: Veldu bakgrunnin til að sýna á kortinu - option_limitways: Aðvörun er náð er í mikil gögn - option_microblog_id: "Örbloggsnafn:" - option_microblog_pwd: "Örbloggslykilorð:" - option_noname: Sýna ónefnda vegi - option_photo: "Mynda KML:" - option_thinareas: Nota litlar línur fyrir svæði - option_thinlines: Nota litlar línur fyrir allt - option_tiger: Sýna óbreytt TIGER gögn - option_warnings: Sýna fljótandi viðvaranir - point: Hnútur - preset_icon_airport: Flugvöllur - preset_icon_bar: Bar - preset_icon_bus_stop: Strætóstopp - preset_icon_cafe: Kaffihús - preset_icon_cinema: Bíóhús - preset_icon_convenience: Kjörbúð - preset_icon_disaster: Bygging á Haítí - preset_icon_fast_food: Skyndibiti - preset_icon_ferry_terminal: Ferjuhöfn - preset_icon_fire_station: Slökkvistöð - preset_icon_hospital: Spítali - preset_icon_hotel: Hótel - preset_icon_museum: Safn - preset_icon_parking: Stæði - preset_icon_pharmacy: Apótek - preset_icon_place_of_worship: Helgistaður - preset_icon_police: Löggustöð - preset_icon_post_box: Póstkassi - preset_icon_pub: Pöbb - preset_icon_recycling: Endurvinnsla - preset_icon_restaurant: Veitingastaður - preset_icon_school: Skóli - preset_icon_station: Lestarstöð - preset_icon_supermarket: Stórmarkaður - preset_icon_taxi: Leigubílar - preset_icon_telephone: Sími - preset_icon_theatre: Leikhús - preset_tip: Veldu meðal forstillinga sem lýsa þessum hlut ($1) - prompt_addtorelation: Bæta $1 í vensl - prompt_changesetcomment: "Sláðu inn lýsingu breytingunum:" - prompt_closechangeset: Loka breytingarsetti $1 - prompt_createparallel: Búa til samhliða veg - prompt_editlive: Breyta beint - prompt_editsave: Breyta með vistun - prompt_helpavailable: Nýr notandi? Skoðaðu hjálpina neðst til vinstri. - prompt_launch: Opna ytri slóðu - prompt_live: Veljir þú að breyta beint munu allar breytingar þínar verka vistaðar samstundis, við mælum ekki með því fyrir byrjendur. Viltu örruglega breyta beint? - prompt_manyways: Það er mjög mikið af gögnum á þessu svæði sem gæti tekið langan tíma að ná í. Viltu þysja nær? - prompt_microblog: Babla á $1 ($2 stafir eftir) - prompt_revertversion: "Breyta til fyrri útgáfu:" - prompt_savechanges: Vista breytingar - prompt_taggedpoints: Þessi vegur inniheldur punkta sem hafa eigindi. Eyða honum samt? - prompt_track: Breyta GPS ferlinum í vegi - prompt_unlock: Smelltu til að aflæsa - prompt_welcome: Velkomin(n) á OpenStreetMap! - retry: Reyna aftur - revert: Taka aftur - save: Vista - tags_backtolist: Aftur á listann - tags_descriptions: Lýsingar á „$1“ - tags_findatag: Eigindaleit - tags_findtag: Eigindaleit - tags_matching: Algeng eigindi sem innihalda „$1“ - tags_typesearchterm: "Sláðu inn eitthvað til að leita að (á ensku):" - tip_addrelation: Bæta í vensl - tip_addtag: Bæta við nýjum eigindum - tip_alert: Villa kom upp - smelltu fyrir frekari upplýsingar - tip_anticlockwise: Rangsælis vegur - smelltu til að breyta átt hans - tip_clockwise: Réttsælis vegur - smelltu til að breyta átt hans - tip_direction: Átt vegar - smelltu til að breyta henni - tip_gps: Sýna GPS ferla (G) - tip_noundo: Ekkert til að taka aftur - tip_options: Breyta stillingum, t.d. breyta bakgrunni kortsins - tip_photo: Hlaða inn myndum - tip_presettype: Veldu hvers konar forstillingar eru sýndar í valmyndinni - tip_repeattag: Nota sömu eigindi og síðasti vegur sem var valinn (R) - tip_revertversion: Veldu útgáfu úr listanum til að breyta hlutnum til - tip_selectrelation: Bæta við valda leið - tip_splitway: Skipta veg á völdum hnút (X) - tip_tidy: Raða punktum í veg (T) - tip_undo: Taka aftur $1 (Z) - uploading: Hleð upp breytingum... - uploading_deleting_pois: Eyði hnútum - uploading_deleting_ways: Eyði vegum - uploading_poi: Hleð upp hnúti $1 - uploading_poi_name: Hleð upp hnúti $1 ($2) - uploading_relation: Hleð upp venslum $1 - uploading_relation_name: Hleð upp venslum $1 ($2) - uploading_way: Hleð upp veg $1 - uploading_way_name: Hleð upp veg $1 ($2) - warning: Staðfestu að þú viljir breyta beint - way: Vegur - "yes": Já diff --git a/config/potlatch/locales/it.yml b/config/potlatch/locales/it.yml deleted file mode 100644 index 4a7d90ab5..000000000 --- a/config/potlatch/locales/it.yml +++ /dev/null @@ -1,234 +0,0 @@ -# Messages for Italian (Italiano) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Bellazambo -# Author: Beta16 -# Author: Davalv -# Author: FedericoCozzi -# Author: McDutchie -# Author: Snow -it: - a_poi: $1 un PDI - a_way: $1 un percorso - action_addpoint: aggiunta nodo alla fine di un percorso... - action_cancelchanges: annullamento modifiche a - action_changeway: Modifica la way - action_createparallel: Creazione percorsi paralleli - action_createpoi: creazione PDI... - action_deletepoint: cancellazione punto... - action_insertnode: aggiunta di un nodo in un percorso... - action_mergeways: unione di due percorsi... - action_movepoi: spostamento PDI... - action_movepoint: spostamento punto... - action_moveway: Spostamento percorso - action_pointtags: impostazione etichette su un punto... - action_poitags: impostazione etichette su un PDI... - action_reverseway: inversione percorso... - action_revertway: Invertire il percorso - action_splitway: separazione di un percorso... - action_waytags: impostazione etichette su un percorso - advanced: Avanzate - advanced_close: Chiudi gruppo di modifiche - advanced_history: Cronologia way - advanced_inspector: Inspector - advanced_maximise: Ingrandisci la finestra - advanced_minimise: Riduci la finestra - advanced_parallel: Percorso parallelo - advanced_tooltip: Azioni di modifica avanzate - advanced_undelete: Annulla cancellazione - advice_bendy: Troppo curvato per essere raddrizzato (SHIFT per forzare) - advice_conflict: Conflitto server - provare a salvare di nuovo - advice_deletingpoi: Cancellazione PDI (Z per annullare) - advice_deletingway: Cancellazione percorso (Z per annullare) - advice_microblogged: Aggiorna il tuo stato $1 - advice_nocommonpoint: I percorsi non hanno nessun punto comune - advice_revertingpoi: Sto ritornando agli ultimi PDI salvati - advice_revertingway: Ripristino dell'ultimo percorso salvato (Z per annullare) - advice_tagconflict: "Le etichette non corrispondono: controllare (Z per annullare)" - advice_toolong: "Troppo lungo per sbloccare: separa in percorsi più brevi" - advice_uploadempty: Niente da caricare - advice_uploadfail: Caricamento interrotto - advice_uploadsuccess: Dati caricati con successo - advice_waydragged: Percorso trascinato (Z per annullare) - cancel: Annulla - closechangeset: Chiusura gruppo di modifiche - conflict_download: Scarica la loro versione - conflict_overwrite: Sovrascrivi la loro versione - conflict_poichanged: Da quando hai iniziato le modifiche, qualcun'altro ha modificato il punto $1$2 - conflict_relchanged: Da quando hai cominciato a modificare, qualcun'altro ha cambiato la relazione $1$2 - conflict_visitpoi: Clicca 'Ok' per mostrare il punto - conflict_visitway: Clicca OK per mostrare il percorso - conflict_waychanged: Da quando si sono iniziate le proprie modifiche, qualcun altro ha modificato il percorso $1$2. - createrelation: Crea una nuova relazione - custom: Personalizza - delete: Cancella - deleting: cancellazione... - drag_pois: Clicca e trascina PDI - editinglive: Modifica online - editingoffline: Modifica offline - emailauthor: \n\nInviare un'e-mail a richard\@systemeD.net con la segnalazione dell'errore, descrivendo cosa si stava facendo nel momento in cui si è verificato. - error_anonymous: Non è possibile contattare un mappatore anonimo. - error_connectionfailed: "La connessione con il server di OpenStreetMap si è interrotta. Qualsiasi modifica recente non è stata salvata.\n\nRiprovare?" - error_microblog_long: "Invio a $1 fallito:\nCodice HTTP: $2\nMessaggio d'errore: $3\n$1 errore: $4" - error_nopoi: "Impossibile trovare il PDI (forse è fuori dallo schermo?): impossibile annullare." - error_nosharedpoint: "I percorsi $1 e $2 non hanno più un punto comune: impossibile annullare la separazione." - error_noway: "Impossibile trovare il percorso $1 (forse è fuori dallo schermo?): impossibile annullare." - error_readfailed: Il server Openstreetmap non ha risposto. Voui riprovare? - existingrelation: Aggiungi ad una relazione esistente - findrelation: Trova una relazione che contiene - gpxpleasewait: Attendere mentre la traccia GPX viene elaborata. - heading_drawing: Disegno - heading_introduction: Introduzione - heading_pois: Come iniziare - heading_quickref: Guida rapida - heading_surveying: Raccolta dati - heading_tagging: Etichettamento - heading_troubleshooting: Diagnostica dei problemi - help: Aiuto - help_html: "Benvenuto su Potlatch\nPotlatch è un programma facile da usare per apportare delle modifiche a OpenStreetMap. Disegna strade, percorsi, marcatori territoriali e negozi partendo dalle proprie rilevazioni GPS, da immagini satellitari oppure da vecchie mappe.\n\nQueste pagine di aiuto ti guideranno attraverso i concetti di base nell'utilizzo di Potlatch, e ti dirà dove trovare maggiori informazioni. Clicca sulle intestazioni che trovi qui sopra per iniziare.\n\nQuando hai finito basta cliccare in qualche altro punto della pagina.\n\n\n\nElementi utili da conoscere\nNon copiare dalle altre mappe!\n\nSe selezioni 'Modifica online' ogni tua modifica sarà inviata immediatamente al database non appena la disegni. Se non sei così sicuro, scegli 'Modifica offline', e le modifiche saranno inviate solamente quando premerai su 'Salva'.\n\nLe modifiche che fai alla mappa vengono visualizzate dopo una o due ore (per alcune cose serve una settimana). Non tutto viene visualizzato nella mappa, la renderebbe troppo complicata. Ma visto che i dati di OpenStreetMap sono open source, chiunque è libero di creare altre mappe che mostrano diverse caratteristiche. Come OpenCycleMap oppure Midnight Commander.\n\nRicorda che è sia una mappa dal bell'aspetto (quindi disegna bene le curve) che un diagramma (assicurati che le strade siano collegate agli incroci).\n\nAbbiamo accennato al fatto di non copiare da altre mappe?\n\n\nMaggiori informazioni\nManuale Potlatch\nListe di distribuzione\nChat in linea (aiuto dal vivo)\nForum web\nWiki della comunità\nSorgenti di Potlatch\n\n\n\nPer iniziare\nOra che hai aperto Potlatch, clicca su 'Modifica offline' per iniziare.\n\nOra sei pronto a disegnare la mappa. La cosa più facile è iniziare inserendo dei PDI (Punti Di Interesse) nella mappa. Potrebbero essere bar, chiese, stazioni ferroviarie... qualsiasi cosa ti piaccia.\n\nClicca e trascina\nPer renderti il lavoro più facile sotto alla mappa c'è una raccolta dei punti di interesse (POI) più comunemente utilizzati. Per inserirlo nella mappa è sufficiente trascinarne uno nella posizione voluta. Non preoccuparti se non riesci a posizionarlo bene al primo colpo: puoi trascinarlo nuovamente finché la posizione non è quella corretta. Nota che il punto di interesse (POI) è evidenziato in giallo quando è selezionato.\n\nNon appena hai finito vorrai probabilmente assegnare un nome al tuo pub (chiesa, stazione, o altro). vedrai che apparirà una piccola tabella in basso. Una delle caselle riporterà la dicitura \"nome\" seguita da \"(digitare il nome qui)\". Quindi basterà cliccare questo testo e digitare il nome.\n\nClicca in qualche altro punto della mappa per deselezionare il tuo punto di interesse (POI) e quindi ricomparirà il piccolo pannello colorato.\n\nFacile, non è vero? Clicca su 'Salva' (in basso a destra) quando hai finito.\nSpostarsi\nPer spostarsi su una parte differente della mappa, basta trascinarla in modo da visualizzare un'area vuota. Potlatch caricherà automaticamente i nuovi dati (guarda in alto a destra).\n\nTi avevamo parlato della 'Modalità offline', ma puoi anche usare la 'modalità online'. In questo caso, le tue modifiche andranno direttamente nel database, quindi non avrai bisogno di cliccare su 'Salva'. Questa modalità va bene per modifiche veloci o durante un mapping party.\n\nPassi successivi\nSei soddisfatto? Bene. Clicca su 'Raccolta dati' in alto per scoprire come diventare un vero mapper!\n\nRilevamento con un GPS\nL'idea che sta dietro a OpenStreetmap è di creare mappe che non violino il copyright di altre mappe. Ciò significa che non puoi copiare da altre parti: devi uscire e mappare le strade per conto tuo. Per fortuna, ciò è molto divertente!\nIl miglior modo per farlo è quello di usare un dispositivo GPS portatile. Trova una zona che non è ancora stata mappata, percorri a piedi o in bicicletta le strade con il GPS acceso. Prendi nota dei nomi delle strade, oltre a qualsiasi altro dato interessante (pub? Chiese?), man man che prosegui.\n\nQuando ritorni a casa, il tuo GPS conterrà una registrazione dei punti geografici dove sei stato. Puoi quindi caricarli su OpenStreetMap.\n\nIl migliore GPS è quello che registra le tracce con una certa frequenza (ogni secondo oppure ogni due) ed ha un sacco di memoria. Molti dei nostri mappatori usano dispositivi Garmin o piccole unità dotate di Bluetooth. Puoi trovare recensioni dettagliate di dispositivi GPS all'interno del nostro wiki.\n\nCaricamento dei tuoi tracciati\nA questo punto, devi estrarre le tracce dal dispositivo GPS. Forse il tuo GPS usa un suo software o permette il trasferminto dei file via USB. Altrimenti, prova con GPSBabel. In ogni caso, tu vuoi che il file sia in formato GPX.\n\nQuindi usa la scheda 'Tracciati GPS' per caricare la tua traccia su OpenStreetMap. Ma questa è solo la prima parte - ancora nulla apparirà sulla mappa. Devi ancora disegnare le strade e darle dei nomi, utilizzando la tua traccia come guida.\nUtilizzo dei tuoi tracciati\nTrova la tua traccia nella lista 'Tracciati GPS', e clicca su 'Modifica' subito alla sua destra. Potlatch partirà questa traccia caricata, insieme ad altri eventuali punti. Sei pronto per creare mappe!\n\nPuoi anche cliccare su questo pulsante per visualizzare i tracciati GPS di chiunque (ma non i punti dei percorsi) per l'area corrente. Tieni premuto Shift per visualizzare soltanto i tuoi tracciati.\nUtilizzo di immagini satellitari\nSe non hai un GPS, non ti preoccupare. In alcune città, abbiamo delle foto satellitari su cui puoi disegnare strade, concesse gentilmente da Yahoo! (grazie!). Esci e prendi nota dei nomi delle strade, poi torna a casa e traccia seguendo le linee delle foto.\n\nSe non vedi alcuna immagine satellitare, clicca sul bottone delle opzioni e controlla che 'Yahoo!' sia selezionato. Se continui a non vedere niente, è probabile che questo servizio non sia disponibile per la tua città, o che tu debba tornare un po' indietro con lo zoom.\n\nNelle opzioni troverai anche altre scelte come una mappa senza copyright del Regno Unito, e OpenTopoMap per gli Stati Uniti. Questi sono tutti selezionati perché siamo autorizzati ad utilizzarle - non copiare da altre mappe o foto aeree. (il copyright fa schifo)\n\nA volte le immagini satellitari sono leggermente spostate da dove sono realmente le strade. Se è il caso tieni premuta la barra spaziatrice e trascina lo sfondo fino ad allinearlo. Le tracce GPS sono più affidabili delle immagini satellitari.\n\nDisegno dei percorsi\nTo draw a road (or 'way') starting at a blank space on the map, just click there; then at each point on the road in turn. When you've finished, double-click or press Enter - then click somewhere else to deselect the road.\n\nTo draw a way starting from another way, click that road to select it; its points will appear red. Hold Shift and click one of them to start a new way at that point. (If there's no red point at the junction, shift-click where you want one!)\n\nClicca 'Salva' (in basso a destra) quando hai fatto. Salva frequentemente in caso di problemi col server.\n\nNon aspettarti di vedere apportate le tue modifiche istantaneamente sulla mappa principale. Di solito bisogna attendere una o due ore, altre volte fino ad una settimana.\nCreazione degli incroci\nE' molto importate che nel punto in cui due strade (o 'way')si incrociano ci sia un punto (o 'nodo') condiviso da entrambe. I navigatori utilizzano questo punto per sapere dove svoltare.\n\nPotlatch si occupa di questo, ma tu devi essere attendo a cliccare esattamente sulla 'way' che stai collegando. Attento alle indicazioni visive: i nodi sulla way diventano blu, il puntatore cambia e una volta fatto il nodo ha un quadrato nero attorno.\nSpostamento ed eliminazione\nFunziona proprio come ti aspetteresti. Per cancellate un nodo selezionalo e premi \"Canc\". Per cancellare l'intera way premi \"Shift-Canc\"\n\nPer spostare qualcosa, semplicemente trascinalo. (Per trascinare un'intera \"way\" devi mantenere cliccato per un pò per evitare che venga fatto accidentalmente).\nDisegno avanzato\nIf two parts of a way have different names, you'll need to split them. Click the way; then click the point where it should be split, and click the scissors. (You can merge ways by clicking with Control, or the Apple key on a Mac, but don't merge two roads of different names or types.)\n\nRoundabouts are really hard to draw right. Don't worry - Potlatch can help. Just draw the loop roughly, making sure it joins back on itself at the end, then click this icon to 'tidy' it. (You can also use this to straighten out roads.)\nPDI (Punti Di Interesse)\nThe first thing you learned was how to drag-and-drop a point of interest. You can also create one by double-clicking on the map: a green circle appears. But how to say whether it's a pub, a church or what? Click 'Tagging' above to find out!\n\nChe tipo di strada è?\nQuando hai disegnato una way, dovresti dire di cosa si tratta. E' una strada principale, un percorso pedonale o un fiume? Come si chiama? Ha regole particolari (esempio: \"no bicycles\")?\n\nIn OpenStreetMap, you record this using 'tags'. A tag has two parts, and you can have as many as you like. For example, you could add highway | trunk to say it's a major road; highway | residential for a road on a housing estate; or highway | footway for a footpath. If bikes were banned, you could then add bicycle | no. Then to record its name, add name | Market Street.\n\nThe tags in Potlatch appear at the bottom of the screen - click an existing road, and you'll see what tags it has. Click the '+' sign (bottom right) to add a new tag. The 'x' by each tag deletes it.\n\nPuoi applicare etichette all'intera 'way', a nodi sulla 'way' (una barriera o un semaforo) e a PDI (Punto Di Interesse).\nUtilizzo delle etichette preimpostate\nPer farti iniziare, Potlatch possiede dei gruppi preimpostati pronti all'uso contenenti le etichette più utilizzate.\n\nSeleziona la way, poi clicca sui simboli finchè non trovi quello adatto. Quindi scegli nel menù l'opzione più appropriata.\n\nThis will fill the tags in. Some will be left partly blank so you can type in (for example) the road name and number.\nStrade a senso unico\nYou might want to add a tag like oneway | yes - but how do you say which direction? There's an arrow in the bottom left that shows the way's direction, from start to end. Click it to reverse.\nScelta delle proprie etichette\nOvviamente non sei limitato alle preimpostate. Cliccando '+' puoi aggiungere qualunque etichetta.\n\nYou can see what tags other people use at OSMdoc, and there is a long list of popular tags on our wiki called Map Features. But these are only suggestions, not rules. You are free to invent your own tags or borrow from others.\n\nSiccome i dati di OpenStreetMap sono utilizzati per generare più mappe differenti, ognuna di queste visualizzerà solo un determinato insieme di etichette.\nRelazioni\nSometimes tags aren't enough, and you need to 'group' two or more ways. Maybe a turn is banned from one road into another, or 20 ways together make up a signed cycle route. You can do this with an advanced feature called 'relations'. Find out more on the wiki.\n\nAnnullamento degli sbagli\nQuesto è il pulsante di annullamento (puoi premere anche Z) - annullerà l'ultima cosa che hai fatto.\n\nYou can 'revert' to a previously saved version of a way or point. Select it, then click its ID (the number at the bottom left) - or press H (for 'history'). You'll see a list of everyone who's edited it, and when. Choose the one to go back to, and click Revert.\n\nIf you've accidentally deleted a way and saved it, press U (for 'undelete'). All the deleted ways will be shown. Choose the one you want; unlock it by clicking the red padlock; and save as usual.\n\nPensi che qualcun'altro abbia fatto un errore? Inviagli un messaggio amichevole. Usa la cronologia (H) per selezionarne il nome, poi clicca 'Posta'.\n\nUse the Inspector (in the 'Advanced' menu) for helpful information about the current way or point.\nDomande frequenti (FAQ)\nHow do I see my waypoints?\nWaypoints only show up if you click 'edit' by the track name in 'GPS Traces'. The file has to have both waypoints and tracklog in it - the server rejects anything with waypoints alone.\n\nMore FAQs for Potlatch and OpenStreetMap.\n\n\n\nLavoro più veloce\nThe further out you're zoomed, the more data Potlatch has to load. Zoom in before clicking 'Edit'.\n\nTurn off 'Use pen and hand pointers' (in the options window) for maximum speed.\n\nIf the server is running slowly, come back later. Check the wiki for known problems. Some times, like Sunday evenings, are always busy.\n\nTell Potlatch to memorise your favourite sets of tags. Select a way or point with those tags, then press Ctrl, Shift and a number from 1 to 9. Then, to apply those tags again, just press Shift and that number. (They'll be remembered every time you use Potlatch on this computer.)\n\nTurn your GPS track into a way by finding it in the 'GPS Traces' list, clicking 'edit' by it, then tick the 'convert' box. It'll be locked (red) so won't save. Edit it first, then click the red padlock to unlock when ready to save.\n\nCosa cliccare\nTrascina la mappa per spostarti.\nDoppio-click per creare un nuovo PDI (Punto Di Interesse).\nSingolo-click per iniziare un nuovo percorso.\nClicca e trascina un percorso o PDI per spostarlo.\nQuando si disegna un percorso\nDoppio-click oppure premi Enter per finire di disegnare.\nCliccare un altro percorso per creare un incrocio.\nShift-click sulla fine di un altro percorso per unire.\nQuando è selezionato un percorso\nClicca un punto per selezionarlo.\nShift-click sul percorso per inserire un nuovo punto.\nShift-click un punto per iniziare un nuovo percorso da lì.\nControl-click su un altro percorso per unire.\n\nScorciatoie da tastiera\nB Aggiunge l'etichetta della sorgente dello sfondo\nC Chiude il gruppo di modifiche\nG Mostra i tracciati GPS\nH Mostra lo storico\nI Mostra l'ispettore\nJ Unisce il punto ai percorsi che si incrociano\n(+Shift) Unjoin from other ways\nK Blocca/sblocca la selezione corrente\nL Mostra la latitudine/longitudine corrente\nM Massimizza la finestra di modifica\nP Crea un percorso parallelo\nR Ripeti le etichette\nS Salva (senza la modalità di modifica dal vivo)\nT Disponi su una linea/cerchio\nU Annulla eliminazione (mostra i percorsi eliminati)\nX Taglia il percorso in due parti\nZ Annulla\n- Rimuovi il punto solamente da questo percorso\n+ Aggiunge una nuova etichetta\n/ Seleziona un altro percorso che condivide questo punto\nCanc Elimina il punto\n (+Shift) Elimina l'intero percorso\nInvio Finisce il disegno della linea\nBarra spaziatrice Afferra e trascina lo sfondo\nEsc Annulla questa modifica; ricarica dal server\n0 Rimuove tutte le etichette\n1-9 Seleziona le etichette preimpostate\n (+Shift) Seleziona le etichette memorizzate\n (+S/Ctrl) Memorizza le etichette\n§ or ` Cicla sui gruppi di etichette\n\n" - hint_drawmode: clic per aggiungere un punto\ndoppio clic/Return\nper terminare la linea - hint_latlon: "lat $1\nlon $2" - hint_loading: caricamento dati - hint_overendpoint: su punto terminale\nclic per congiungere\nshift-clic per unire - hint_overpoint: su punto ($1)\nclic per congiungere - hint_pointselected: punto selezionato\n(shift-clic sul punto per\niniziare una nuova linea) - hint_saving: Salvataggio dati - hint_saving_loading: carica/salva dati - inspector: Inspector - inspector_duplicate: Duplicato di - inspector_in_ways: Nei percorsi - inspector_latlon: "Lat $1\nLon $2" - inspector_locked: Bloccato - inspector_node_count: ($1 volte) - inspector_not_in_any_ways: In nessun percorso (PDI) - inspector_unsaved: Non salvato - inspector_uploading: (caricamento) - inspector_way_connects_to: Collegato a $1 percorsi - inspector_way_connects_to_principal: È connesso a $1 $2 ed altri $3 $4 - inspector_way_nodes: $1 nodi - inspector_way_nodes_closed: $1 nodi (chiusi) - loading: Caricamento... - login_pwd: "Password:" - login_retry: Il tuo login non è stato riconosciuto. Riprova - login_title: Impossibile fare il login - login_uid: "Nome utente:" - mail: Posta - more: Ancora - newchangeset: "Si prega di riprovare: Potlatch aprirà un nuovo gruppo di modifiche." - "no": 'No' - nobackground: Senza sfondo - norelations: Nessuna relazione nell'area attuale - offset_broadcanal: Alzaia larga - offset_choose: Cambia offset (m) - offset_dual: Carreggiate separate - offset_motorway: Autostrada - offset_narrowcanal: Alzaia stretta - ok: OK - openchangeset: Apertura gruppo di modifiche - option_custompointers: Usa puntatori penna e mano - option_external: "Link esterno:" - option_fadebackground: Sfondo sfumato - option_layer_cycle_map: OSM - cycle map - option_layer_maplint: OSM - Maplint (errori) - option_layer_nearmap: "Australia: NearMap" - option_layer_ooc_25k: "Storico UK: 1:25k" - option_layer_ooc_7th: "Storico UK: 7°" - option_layer_ooc_npe: "Storico UK: NPE" - option_layer_ooc_scotland: "Storico UK: Scozia" - option_layer_os_streetview: "UK: OS StreetView" - option_layer_streets_haiti: "Haiti: nomi delle strade" - option_layer_surrey_air_survey: "UK: Surrey Air Survey" - option_layer_tip: Scegli lo sfondo da visualizzare - option_limitways: Avverti quando carichi molti dati - option_microblog_id: "Nome microblog:" - option_microblog_pwd: "Password microblog:" - option_noname: Evidenzia strade senza nome - option_photo: "KML foto:" - option_thinareas: Usa linee più sottili per le aree - option_thinlines: Usa linee sottili a tutte le scale - option_tiger: Evidenzia dati TIGER non modificati - option_warnings: Mostra avvertimenti galleggianti - point: Punto - preset_icon_airport: Aeroporto - preset_icon_bar: Cocktail bar - preset_icon_bus_stop: Fermata bus - preset_icon_cafe: Bar - preset_icon_cinema: Cinema - preset_icon_convenience: Minimarket - preset_icon_disaster: Edificio di Haiti - preset_icon_fast_food: Fast food - preset_icon_ferry_terminal: Traghetto - preset_icon_fire_station: Pompieri - preset_icon_hospital: Ospedale - preset_icon_hotel: Hotel - preset_icon_museum: Museo - preset_icon_parking: Parcheggio - preset_icon_pharmacy: Farmacia - preset_icon_place_of_worship: Luogo di culto - preset_icon_police: Polizia - preset_icon_post_box: Cassetta postale - preset_icon_pub: Pub - preset_icon_recycling: Riciclaggio - preset_icon_restaurant: Ristorante - preset_icon_school: Scuola - preset_icon_station: Stazione ferroviaria - preset_icon_supermarket: Supermercato - preset_icon_taxi: Posteggio taxi - preset_icon_telephone: Telefono - preset_icon_theatre: Teatro - preset_tip: Scegli da un menù di tag predefiniti che descrivano $1 - prompt_addtorelation: Aggiungi $1 ad una relazione - prompt_changesetcomment: "Inserisci una descrizione delle modifiche:" - prompt_closechangeset: Chiudi gruppo di modifiche $1 - prompt_createparallel: Crea percorso parallelo - prompt_editlive: Modifica online - prompt_editsave: Modifica offline - prompt_helpavailable: Nuovo utente? Cerca l'aiuto in basso a sinistra. - prompt_launch: Lancia un URL esterno - prompt_live: Nella modalità "online" ogni modifica verrà salvata immediatamente nel database di OpenStreetMap - sconsigliata per gli inesperti. Sei sicuro? - prompt_manyways: Quest'area è molto dettagliata e serve molto tempo per caricarla. Preferisci ingrandire lo zoom? - prompt_microblog: Invio a $1 ($2 rimanenti) - prompt_revertversion: "Ripristina una versione precedente:" - prompt_savechanges: Salva le modifiche - prompt_taggedpoints: Alcuni dei punti di questo percorso sono etichettati o presenti in una relazione. Sicuro di voler eliminare? - prompt_track: Converti la tua traccia GPS in percorsi (bloccati) per la modifica. - prompt_unlock: Clicca per sbloccare - prompt_welcome: Benvenuti su OpenStreetMap! - retry: Riprova - revert: Ripristina - save: Salva - tags_backtolist: Torna all'elenco - tags_descriptions: Descrizioni di '$1' - tags_findatag: Trova un tag - tags_findtag: Trova tag - tags_matching: Etichette comuni corrispondenti a '$1' - tags_typesearchterm: "Inserisci una parola da cercare:" - tip_addrelation: Aggiungi ad una relazione - tip_addtag: Aggiungi una nuova etichetta - tip_alert: Si è verificato un errore (clic per i dettagli) - tip_anticlockwise: Percorso circolare antiorario - clic per invertire - tip_clockwise: Percorso circolare orario - clic per invertire - tip_direction: Direzione del percorso - clic per invertire - tip_gps: Mostra le tracce GPS (G) - tip_noundo: Nulla da annullare - tip_options: Imposta le opzioni (scegli lo sfondo della mappa) - tip_photo: Carica foto - tip_presettype: Scegli che tipo di preset mostrare nel menu. - tip_repeattag: Ripeti le etichette del percorso precedentemente selezionato (R) - tip_revertversion: Scegli la versione da ripristinare - tip_selectrelation: Aggiungi alla rotta scelta - tip_splitway: Separa percorso nel punto selezionato (X) - tip_tidy: Ordina i punti nel percorso (T) - tip_undo: Annulla $1 (Z) - uploading: Caricamento... - uploading_deleting_pois: Cancellazione PDI - uploading_deleting_ways: Cancellazione percorsi - uploading_poi: Caricamento PDI $1 - uploading_poi_name: Caricamento PDI $1, $2 - uploading_relation: Caricamento relazione $1 - uploading_relation_name: Caricamento relazione $1, $2 - uploading_way: Caricamento percorso $1 - uploading_way_name: Caricamento percorso $1, $2 - warning: Attenzione! - way: Percorso - "yes": Sì diff --git a/config/potlatch/locales/ja.yml b/config/potlatch/locales/ja.yml deleted file mode 100644 index 4a7f11bb3..000000000 --- a/config/potlatch/locales/ja.yml +++ /dev/null @@ -1,219 +0,0 @@ -# Messages for Japanese (日本語) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Aotake -# Author: Fryed-peach -# Author: Higa4 -# Author: Mage Whopper -# Author: Nazotoko -ja: - a_poi: POI（地物）を$1 - a_way: ウェイを $1 - action_addpoint: ウェイの端にノードを追加 - action_cancelchanges: 変更を中止 - action_changeway: ウェイに変換 - action_createparallel: 平行ウェイを作成 - action_createpoi: POI（地物）を作成 - action_deletepoint: 点を削除 - action_insertnode: ウェイの途中にノードを追加 - action_mergeways: 2つのウェイを結合 - action_movepoi: POI（地物）を移動 - action_movepoint: 点を移動 - action_moveway: ウェイを移動 - action_pointtags: 点にタグを設定 - action_poitags: POI（地物）にタグを設定 - action_reverseway: ウェイを反転 - action_revertway: ウェイを反転 - action_splitway: ウェイを分割 - action_waytags: ウェイにタグを設定 - advanced: 高度な編集 - advanced_close: 変更セットを閉じる - advanced_history: ウェイの履歴 - advanced_inspector: インスペクタ - advanced_maximise: ウィンドウを最大化 - advanced_minimise: ウィンドウを最小化 - advanced_parallel: 平行ウェイ - advanced_tooltip: 高度な編集操作 - advanced_undelete: 削除を取り消す - advice_bendy: まっすぐにするには曲がりすぎています（Shift を押しながら実行すると強制実行します） - advice_deletingpoi: POI（地物）を削除しました。（Zで取り消し） - advice_deletingway: ウェイを削除 (Z で取り消し) - advice_nocommonpoint: そのウェイは共通の点を持ってません。 - advice_revertingpoi: 最後に保存された POI（地物）を差し戻します。(Zで取り消し) - advice_revertingway: 最後に保存したウェイの差し戻し (Zで取り消し) - advice_tagconflict: タグが合ってません。 - 確認してください。(Zで取り消し) - advice_toolong: ウェイが長すぎてロック解除できません - 短いウェイに分割して下さい。 - advice_uploadempty: アップロードするものはありません - advice_uploadfail: アップロードを停止しました。 - advice_uploadsuccess: アップロードに成功しました。 - advice_waydragged: ウェイをドラッグしました。（Zで取り消し） - cancel: 中止 - closechangeset: 変更セットを閉じます - conflict_download: 相手の変更した分をダウンロード - conflict_overwrite: 相手のバージョンを上書き - conflict_poichanged: あなたが編集中に、誰か他の人がポイント $1$2 を変更しました。 - conflict_relchanged: あなたが編集中に、他の誰かがリレーション $1$2 を変更しました。 - conflict_visitpoi: "'OK' をクリックしてポイントを表示。" - conflict_visitway: "'OK' をクリックしてウェイを表示。" - conflict_waychanged: あなたが編集を開始してから、誰か別の人がウェイ $1$2 を変更しました。 - createrelation: 新しいリレーションを作成 - custom: "カスタム:" - delete: 削除 - deleting: 削除 - drag_pois: POI（地物）をドラッグ＆ドロップ - editinglive: ライブ編集 - editingoffline: オフライン編集中 - emailauthor: \n\nあなたが何を行っていたかを書いたバグレポートを、 richard\@systemeD.net 宛てにe-mailで送付して下さい。 - error_anonymous: 匿名マッパーと連絡を取ることはできません。 - error_connectionfailed: 申し訳ありません。OpenStreetMap サーバへの接続に失敗しました。 直近の変更は保存されていません。\n\n再送信しますか? - error_nopoi: 該当するPOI（地物）が見付からないため、取り消せませんでした。 (画面の範囲外になっていませんか?) - error_nosharedpoint: $1 と $2 のウェイは点を共有していないため、分割の取り消しができませんでした。 - error_noway: $1 というウェイが見付からないため、取り消しができませんでした。 (画面表示の範囲外になっていませんか?) - error_readfailed: 申し訳ありません - OpenStreetMap サーバがデータ要求に対して応答しません。\n\nもう一度やり直しますか？ - existingrelation: 既存のリレーションを追加 - findrelation: 以下に含まれるリレーションを検索 - gpxpleasewait: GPX トラックが処理されるまでしばらくお待ち下さい。 - heading_drawing: 描画 - heading_introduction: 紹介 - heading_pois: はじめに - heading_quickref: クイックリファレンス - heading_surveying: 調査中 - heading_tagging: タグ付け - heading_troubleshooting: トラブルシューティング - help: ヘルプ - help_html: "Potlatch へようこそ\nPotlatchは OpenStreetMap を簡単に編集できるツールです。GPSトラックや、衛星写真、古地図を参考に道路を描いたり、店やランドマークを書き加えることができます。\n\nこのヘルプでは、Potlatchの簡単な使い方を説明し、詳しい情報の見つけ方を説明します。知りたい情報について上部の見出しをクリックしてください。\n\nヘルプを終了するには、ヘルプの外側をクリックしてください。\n\n\n\n知っておくと便利な情報\n他の地図からコピーしないでください！\n\n'ライブ編集'を選ぶと、変更がすべてその場で（即時に）データベースに反映されます。自分の作業にあまり自信がなければ、'保存を使って編集' を使用してください。こちらは、'保存'をクリックするまで保存されません。\n\n編集した結果は、通常、1〜2時間程度で地図に反映されます (場合によっては一週間程度かかることもあります)。描いたもの全てを地図に表示してしまうと雑然としてしまうため、全てを地図上に表示してはいません。 OpenStreetMap のデータはオープンソースであるため、目的にあわせて何を表示するかを選択し、自由に地図を作ることができます (例えばOpenCycleMap や Midnight Commanderなど)。\n\n見栄えがよく（きれいな曲線を描いてください）、わかりやすい地図（交差点では道路を合流させてください）を目指してください。\n\n繰り返します。ほかの地図からコピーしないようにしてください！\n\n\nもっと詳しく知るには\nPotlatch マニュアル\nメーリングリスト\nチャット（リアルタイムヘルプ）\nWeb フォーラム\nWiki\nPotlatch ソースコード\n\n\n\nはじめに\n編集タブからPotlatchの画面を開いたら、 '保存を使って編集'を選んで編集を始めることができます。\n\nこれだけで地図を描き始めることができます。まずはなにかPOIを追加してみるのがよいでしょう。POI（地物）とは、お店、飲み屋、駅、バス停、駐車場など、地図上にある道以外のもの全てです。\n\nドラッグ・アンド・ドロップ\n操作は非常に簡単です。画面下に一般的なPOIのアイコンが並んでいますので、そのうち一つを地図上の正しいところにドラッグしてください。失敗しても、何度でも動かせます。POIは選択されているときには黄色い縁取りが表示されます。\n\n次に、それに名前をつけましょう。POIを選択した状態では、画面左下に小さなテーブルが表示されます。そのうち、name（名前）の右側の\"(type name here)\"と書いてある欄をそのPOIの名前に変更してください。日本語の場合、日本語の名前の右に[スペース](roman name)でアルファベット表記を追加することが推奨されています。\n\n選択を解除するには、地図の別の場所をクリックします。すると画面下部のテーブルが消えてカラフルなパネルの表示に戻ります。\n\n'保存'をクリックして変更を保存します。簡単でしょう？\n地図の移動\n別の地域を表示するには、地図の何も描かれていない場所をドラッグしてください。右上に読み込み中の表示が出て、自動的に足りない部分を読み込みます。\n\n'保存を使って編集' を使うよう書きましたが、 'ライブ編集'を使うこともできます。これを使うと、変更したものがすぐにサーバに送られて保存されます。そのため'保存'のボタンがありません。マッピングパーティーなどのイベントで使用するとよいでしょう。\n\n次のステップ\nうまくできましたか？もっと詳しくはこの画面の上にある \"測量\" をクリックして本物のマッパーになりましょう！\n\nGPSで測量する\nOpenStreetMapは、著作権に制限されない地図を作ることを目指しています。これは、あなたがどこからもコピーすることができないことを意味します。実際にその道に行って確かめるしか方法がないのです。幸いなことに、これはとても楽しい作業です！\nもっともよいのは、ハンディGPSロガーを持って歩くことです。まだ地図に書かれてない地域をみつけたら、自転車や歩いてその道へ行き、GPSロガーに記録します。歩きながら、道の名前やその他周りにあるもの（店/学校など）をできるだけ記録してください。\n\n家に戻ったら、GPSに記録されているトラックログをOpenStreetMapにアップロードしましょう。トラックログにはあなたが通った位置が記録されています。\n\nGPSを選ぶのであれば、短い間隔で、記録できる容量が大きい物がよいでしょう。多くのマッパーは Garminのハンドヘルド機や、小さなBluetoothのモジュールを使っています。GPSのレビューがwikiにあります。\n\nトラックのアップロード\nGPSからトラックログを取り出しましょう。GPSに付属しているソフトで取り出すか、おそらくUSB経由でファイルをコピーできるはずです。みつからなければGPSBabel が使えるかもしれません。どの場合でも、使いたいのはGPXファイルです。\n\n次に、'GPSトレース' タブをクリックして、GPSトラックを OpenStreetMap にアップロードします。アップロードと地図を描くのは別個の作業です。GPSトラックを目印に、道路やその名前はひとつひとつ手で描く作業が必要です。\nトラックを使う\n'GPSトレース' に表示されているトラックからあなたの物を探し出して、その右にある '編集' をクリックしてください。Potlatchはそのトラックを読み込んで、ウェイポイントを追加してくれるので、すぐに描きはじめることができます。\n\nまた、Potlatchの画面で、左下にあるGPSトラックを表示ボタンをクリックすると、その範囲にアップロードされている全てのGPSトラックを表示できます。Shiftを押しながらクリックすると、あなたがアップロードしたGPSトラックだけが表示されます。\n衛星写真を使う\nGPSを持っていなくても心配はいりません。Yahoo! が航空写真を提供してくれているところがあり、それをなぞることも可能です。※訳注　日本付近では残念ながらあまり解像度が高くありません。\n\n衛星写真が見えないときは、画面左下にあるオプションボタンをクリックし、'Yahoo!'にチェックが入っていることを確認してください。それでも見えないときは、表示している地域がサポートされていないか、表示している解像度を変更したら見えるかもしれません。\n\n同じオプションのボタンのなかに、イギリスで著作権の切れた地図やOpenStreetMapの地図も選択できるようになっています。これらは、私たちが使ってよい地図を特別に選んで掲載しています。ここに掲載されていない、どんな地図や航空写真からもコピーすることはしないでください。\n\n衛星写真が実際の道路の位置からずれて表示されることもあります。もしそういったケースをみつけたら、スペースキーを押しながらドラッグして、衛星写真が道に合うまでずらしてください。いつでも衛星写真よりGPSトラックを信頼するようにしてください。\n\nウェイを描く\n道路やウェイを開始するには、何も無いところでクリックして開始して、曲がるたびにクリックしてノードを置いてください。最後のノードではダブルクリックするか、Enter(return)キーを押してください。選択を解除するには、描いたウェイ以外のところをクリックしてください。\n\n既に描かれているウェイから別のウェイを分岐するには、クリックでウェイを選択し、ノードが赤く表示された状態にします。Shiftを押しながらノードをクリックし、新しいウェイを開始します。（赤い点が元々無い位置から分岐するときには、シフトを押しながらウェイ上をクリックすると新しいノードが追加できます。）\n\n最後に画面右下にある '保存' をクリックしてください。サーバに問題が発生して保存に失敗してしまうことがあるので、頻繁に保存するよう心がけるとよいでしょう。\n\n変更したものはすぐに地図に反映されるのではありません。通所一時間〜に時間、長いときには1週間ほどかかって反映されます。\n接続する\n交わる道路を地図上で接続することはとても需要です。経路探索をする際に、どこが通れるのか判断する際に使用するからです。\n\nPotlatchはきちんとウェイの上をクリックしているかどうか、できる限り注意深くチェックしています。ヒントを表示するので画面をよく見てください。ポインタがウェイ上にあるとき、ウェイを構成するノードは青くなります。そこでウェイを終了すると、接続したノードは黒で縁取りされます。\n移動と削除\nノードを削除するには、選択してDeleteキーを押してください。ウェイ全体を削除するには、Shift + Deleteを押してください。(Deleteがfn+deleteのキーボードもあります)\n\n移動するには、移動したい物をドラッグしてください。（クリックで移動したい物を選択し、ドラッグします。間違えて移動してしまったら取り消してください）\nもっと詳しい描き方\n一つのウェイが場所によって異なる名前になる場合には、分割する必要があります。ウェイをクリックし、分割する位置のノードをクリックし、画面左下のスライサーをクリックします。（逆に二つのウェイをつなぐにはCtrl（Macではアップルキー）を押しながらウェイをクリックします。異なる名前や種類のウェイ同士はマージしないでください）\n\n曲がりくねったを正確に描くのは非常に難しいものです。しかし心配はいりません。Potlatchには支援機能があります。適当に丸くなるようにウェイを作り、先頭のノードに最後のウェイをつなげて、円になるようにします。その状態で 'ポイントを整理' アイコンをクリックしてください。（同じアイコンを直線に並べることにも使えます。）\nPOI（地物）\nはじめに学んだ方法は、ドラッグ&ドロップでのPOIの作成方法でした。地図上をダブルクリックしてもPOIは作成できます。そこから名前をつける方法は、タグ付けタブをクリックして先に進んでください！\n\n道路の種類\nウェイを描いたら、それが何なのかを説明する方がよいでしょう。高速道路でしょうか、それとも砂利道でしょうか？もしくは川？ 名前は何でしょう？特別な規制はありませんか？（自転車進入禁止など）\n\nOpenStreetMapでは、これらの情報はタグを使って記録します。タグは二つの部分でできており、ウェイやPOIにいくつでも付けることができます。例えば、highway | trunk のタグを付けるとそれは主要な道路（日本では国道）になり、 highway | residential とすると、住宅地を通る道路になり、 highway|footway では歩道になります。自転車が通行できないときには bicycle | no を追加します。名前を追加するには name | 靖国通り (Yasukuni Dōri) などとします。\n\nタグはPotlatchの画面の下のほうに表示されます。道路をクリックすると、その道路に付けられているタグが表示されます。右下にある '+' をクリックすると、新しいタグを追加できます。また、それぞれのタグについている 'x' をクリックするとそのタグを削除できます。\n\nウェイ全体に一つのタグを付けることも、ウェイの中の一つ一つのノードにそれぞれタグを付けることもできます。もちろんPOIにも付けることができます。\nプリセットタグの使用\n簡単に始められるように、Potlatchはあらかじめ一般的なタグは選んで設定できるようになっています。\n\nウェイを選択し、適したシンボルになるまでクリックし、メニューから最適なオプションを選択してください。\n\nこれでタグが追加されます。追加するタグによっては、道路の名前や番号など、内容を手で入力するために空白になっているタグがあります。\n一方通行道路\noneway | yes を追加すると、一方通行の道路になります。どちら向きかはPotlatchに表示しており、逆向きのときには、選択した状態で画面左下にある矢印をクリックすると反転します。\n独自のタグを作る\nプリセット以外のタグも使うこともできます。画面右下の '+' ボタンから好きなタグを追加できます。\n\nほかのマッパーたちが使っているタグは OSMdoc で見ることができます。osm wikiのMap Featuresに非常に大きなリストがあります。これらは提案であり、ルールではありません。独自のタグを作るのも、誰かが提案した物を使うのも自由です。\n\nOpenStreetMapのデータは様々な地図で使われており、それぞれの地図やレンダーが必要なタグを選んで表示します。\nリレーション\n二つ以上のウェイをグループで扱いたいなど、タグのシステムでは十分ではないこともあります。たとえば、ある道路から別の道路へ曲がることが禁止されている場合や、20以上のウェイで構成されている自転車道などです。これらの場合には、'リレーション' と呼ばれる機能が有効です。Wikiにリレーションの詳しい解説があります。\n\n取り消し\nこれが取り消しボタンです。（Zキーを押しても同じ動作をします） 一つ前に行った全ての動作を取り消すことができます。\n\n保存した版を元に戻す（差し戻し）には、戻したいウェイやノードを選択し、画面左下に表示されているIDをクリックするか、 キーボードのHキーを押します。すると、少し時間がかかった後に、選択したウェイを編集した履歴の一覧が表示されます。戻したい版を選択して、'差し戻し' をクリックすると、選択した版の状態に戻ります。\n\n誤って削除した状態で保存してしまったときには、削除してしまった位置を表示した状態で、キーボードの 'U' (Undelete) を押します。その付近で削除された全てのウェイが赤で表示され、選択すると画面下部に表示される 'クリックしてロック解除' をクリックすると元に戻るので、通常通り保存します。\n\n他の人が間違えて作図しているときには、友好的なメッセージを送ってみましょう。履歴メニュー (H)を使って編集したユーザーを選択し、'メール' をクリックしてください。\n\nウェイやノードの情報を見るには、拡張メニューにあるインスペクタを使ってみてください。\nよくある質問と回答\nウェイポイントはどうやったら見られますか？\nウェイポイントは 'GPSトレース' から '編集' をクリックしたときにだけ表示されます。アップロードするファイルにはトラック（歩いたルートのログ）とウェイポイントが両方含まれていることが必要です。ウェイポイントのみのファイルはサーバが受け入れていません。\n\nより細かいFAQはPotlatch の FAQ、OpenStreetMap のFAQを参照してください。\n\n\n\n効率よく作業しましょう\n広い範囲を表示したままだと、Potlatchはより多くのデータを読み込む必要があります。'編集' をクリックする前にできるだけ拡大しておきましょう。\n\n速度を最大にするには、オプションの 'ペンのポインタと手のポインタを使用する' をオフにしてください。\n\nサーバから応答が無いときや、応答が遅いときには、またあとで作業するようにしましょう。サーバステータスでは認識されている問題点を公開しています。日曜日の午後（JST - 日本時間では深夜）などいくつかの時間帯では常に遅い状態となっています。\n\nあなたがよく使うタグの組み合わせを Potlatch に記憶しておくことができます。よく使うタグの組み合わせになっているウェイを選択し、Ctrl + Shift + 番号を押します。番号は1-9のキーが有効です。別のウェイやノードを選択し、Shift+番号を押すことでそれらのタグを適用できます。（この情報はPCに記憶されます。別のPCで使うときには同じ操作が必要となります。）\n\nトレースからウェイを作成するには、'GPSトレース' の一覧からあなたのトラックを選択し '編集' をクリックします。画面にダイアログが表示されるので、'GPSトラックをロックされたウェイに変換' をチェックします。画面上に赤いロックされた状態で表示されますこれはロックされているのでそのままでは保存されません。そのまま保存するには編集してロックを解除して保存してください。\n\nクリック操作\n地図をドラッグ 表示する地域を移動\nダブルクリック 新規POIを作成\nクリック 新規ウェイを開始\nウェイやPOIをドラッグ 移動\nウェイを描く\nダブルクリック もしくは Enter (Return)キー 描画の終了\nクリック 接続を作成する。\n別のウェイの上で Shift-click マージ\nウェイ選択中\n点をクリック ノードの選択\nウェイの上でShift-クリック 新しいノードの追加\nノードをShift-クリック そこから新しいウェイを開始\n別のウェイをControl-クリック 結合する\n\nショートカットキー\nB 背景(Background source) タグを追加\nC 変更セット (Changeset) を閉じる\nG GPS トラックを表示\nH 履歴( history) を表示\nI インスペクタ(inspector) を表示\nJ 交差するウェイに接続 (Join)\n(+Shift) Unjoin from other ways\nK 選択をロック/ロック解除(Lock/unlock)\nL 現在の緯度/経度(latitude/longitude) を表示\nM ウィンドウを最大化 (Maximise)\nP 並行ウェイを描く (parallel)\nR 最後に入力したタグを再入力 (Repeat)\nS 保存 (Save)\nT 直線/円形に整形する (Tidy)\nU 削除の取り消し (Undelet)\nX ウェイを分割\nZ 取り消し\n- そのウェイからノードを取り除く\n+ タグを追加\n/ ノードを共有する別のウェイを選択\nDelete 選択の削除\n (+Shift) ウェイ全体を削除\nReturn 線描を終了\nSpace （スペースバー）背景をドラッグ\nEsc 編集を取りやめ、サーバから再読み込み\n0 全てのタグを取り除く\n1-9 タグを選択\n (+Shift) 記憶したタグを選択\n (+S/Ctrl) タグを記憶\n§ or ` タググループを順次選択\n\n" - hint_drawmode: クリックして点を追加\nダブルクリック/Returnで\n線を終了 - hint_latlon: "緯度 $1\n経度 $2" - hint_loading: ウェイを読み込んでいます。 - hint_overendpoint: 終端の点（$1）上で\nクリックして接続\nShiftキーを押しながらクリックして結合 - hint_overpoint: 点の上で\nクリックして接続 - hint_pointselected: 点を選択\n（Shiftキーを押しながら点をクリックして\n新しい線を開始） - hint_saving: データ保存中 - hint_saving_loading: データを読み込むか書き込みしています - inspector: インスペクタ - inspector_in_ways: ウェイに属している - inspector_latlon: "緯度 (Lat) $1\n経度 (Lon) $2" - inspector_locked: ロック済 - inspector_node_count: ($1 回) - inspector_not_in_any_ways: ウェイに属していない (POI) - inspector_unsaved: 未保存 - inspector_uploading: アップロード中 - inspector_way_connects_to: $1 ウェイに接続 - inspector_way_connects_to_principal: $1 と $2 接しています。また、$3 の $4と接しています。 - inspector_way_nodes: $1 ノード - inspector_way_nodes_closed: $1 ノード (closed) - loading: 読み込み中… - login_pwd: パスワード - login_retry: ログインに失敗しました。やり直してください。 - login_title: ログインできません - login_uid: ユーザー名 - mail: メール - more: 詳細 - newchangeset: "やり直してください: Potlatch は新しい変更セットを開始します。" - "no": いいえ - nobackground: 背景なし - norelations: 現在のエリアにリレーションはありません - offset_broadcanal: 広い運河の船引き道 - offset_choose: オフセットを選ぶ (m) - offset_dual: 中央分離道路 (D2) - offset_motorway: 自動車専用道 (D3) - offset_narrowcanal: 狭い運河の船引き道 - ok: OK - openchangeset: 変更セットを開いています。 - option_custompointers: ペンのポインタと手のポインタを使用する - option_external: "外部起動:" - option_fadebackground: 背景を隠す - option_layer_cycle_map: OSM - cycle map - option_layer_maplint: OSM - Maplint (エラー用) - option_layer_nearmap: "オーストラリア: NearMap" - option_layer_ooc_25k: "UK historic: 1:25k" - option_layer_ooc_7th: "UK historic: 7th" - option_layer_ooc_npe: "UK historic: NPE" - option_layer_tip: 背景を選択 - option_limitways: ダウンロードに時間がかかりそうな時には警告する - option_microblog_id: "マイクロブログ名:" - option_microblog_pwd: "マイクロブログのパスワード:" - option_noname: 名前のついていない道路を強調 - option_photo: 写真 KML - option_thinareas: エリアにもっと細い線を使用 - option_thinlines: 全ての縮尺で細い線を使用する - option_tiger: TIGER の無変更ウェイをハイライト - option_warnings: 吹き出し警告を表示する。 - point: 点 - preset_icon_airport: 空港 - preset_icon_bar: バー (立ち飲み屋) - preset_icon_bus_stop: バス停 - preset_icon_cafe: 喫茶店 - preset_icon_cinema: 映画館 - preset_icon_convenience: コンビニ - preset_icon_fast_food: ファストフード - preset_icon_ferry_terminal: フェリー - preset_icon_fire_station: 消防署 - preset_icon_hospital: 病院 - preset_icon_hotel: ホテル - preset_icon_museum: 博物館 - preset_icon_parking: 駐車場 - preset_icon_pharmacy: 薬局 - preset_icon_place_of_worship: 神社仏閣 - preset_icon_police: 交番 - preset_icon_post_box: ポスト - preset_icon_pub: パブ (居酒屋) - preset_icon_recycling: リサイクル - preset_icon_restaurant: レストラン - preset_icon_school: 学校 - preset_icon_station: 鉄道駅 - preset_icon_supermarket: スーパーマーケット - preset_icon_taxi: タクシー乗り場 - preset_icon_telephone: 電話 - preset_icon_theatre: 劇場 - preset_tip: $1 を表すものをプリセットタグから選ぶ - prompt_addtorelation: リレーションに $1 を追加 - prompt_changesetcomment: "あなたの変更の説明を入力してください。:" - prompt_closechangeset: 変更セット $1 を閉じます。 - prompt_createparallel: 平行ウェイを作成 - prompt_editlive: ライブ編集（変更を即反映） - prompt_editsave: 保存を使って編集 - prompt_helpavailable: 新しいユーザーですか? 左下にヘルプがあります。 - prompt_launch: 外部URLを立ち上げる - prompt_live: ライブモードでは、あなたの行った変更はすぐに OpenStreetMap のデータベースに反映されます。初心者にはお勧めしません。編集を始めますか？ - prompt_manyways: この地域は非常に詳細に描かれているため、このままでは読み込みに時間がかかります。もっと拡大しますか？ - prompt_revertversion: "以前に保存されたバージョンに差し戻す:" - prompt_savechanges: 変更を保存 - prompt_taggedpoints: このウェイに含まれている点のいくつかにタグが付けられています。 本当に削除しますか? - prompt_track: あなたのGPS トラックをウェイに変換します。 - prompt_unlock: クリックしてロック解除 - prompt_welcome: OpenStreetMap へようこそ! - retry: 再送 - revert: 差し戻し - save: 保存 - tags_backtolist: リストに戻る - tags_typesearchterm: "検索する単語を入力してください:" - tip_addrelation: リレーションに追加 - tip_addtag: 新しいタグを追加 - tip_alert: エラーが発生しました。クリックすると詳細が表示されます。 - tip_anticlockwise: 反時計回りのcircular way - クリックして反転 - tip_clockwise: 時計回りのcircular way - クリックして反転 - tip_direction: ウェイの方向 - クリックして反転 - tip_gps: GPS トラックを表示 (G) - tip_noundo: 取り消せる動作がありません - tip_options: オプション設定 (地図背景の選択) - tip_photo: 写真をロード - tip_presettype: 提供されているプリセットの種類をメニューから選択します。 - tip_repeattag: 前回選択したウェイのタグを再入力 (R) - tip_revertversion: 差し戻し先のバージョンを選択 - tip_selectrelation: 選択したルートに追加 - tip_splitway: 選択した点でウェイを分割 (X) - tip_tidy: ウェイ上のポイントを整理 (T) - tip_undo: $1 を取り消し (Z) - uploading: アップロード中... - uploading_deleting_pois: POI（地物） を削除中 - uploading_deleting_ways: ウェイを削除 - uploading_poi: POI（地物） $1 をアップロード中 - uploading_poi_name: POI（地物） $1, $2 をアップロード中 - uploading_relation: リレーション $1 をアップロード中 - uploading_relation_name: リレーション $1, $2 をアップロード中 - uploading_way: ウェイ $1 をアップロード中 - uploading_way_name: ウェイ $1, $2 をアップロード中 - warning: 警告！ - way: ウェイ - "yes": はい diff --git a/config/potlatch/locales/ka.yml b/config/potlatch/locales/ka.yml deleted file mode 100644 index 9b6ccb218..000000000 --- a/config/potlatch/locales/ka.yml +++ /dev/null @@ -1,104 +0,0 @@ -# Messages for Georgian (ქართული) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: David1010 -ka: - a_way: $1 გზა - action_changeway: გზის ცვლილებები - action_createparallel: პარალელური გზების შექმნა - action_deletepoint: წერტილის წაშლა - action_insertnode: გზაზე წერტილის დამატება - action_mergeways: ორი გზის დაკავშირება - action_movepoint: წერტილის გადადგილება - action_moveway: გზის გადაადგილება - action_reverseway: გზის მიმართულების შეცვლა - action_revertway: გზის დაბრუნება - action_splitway: გზის გაყოფა - advanced: გაფართოებული - advanced_close: რედაქტირების პაკეტის დახურვა - advanced_history: გზის ისტორია - advanced_inspector: ინსპექტორი - advanced_maximise: ფანჯრის გაშლა - advanced_minimise: ფანჯრის დაპატარავება - advanced_parallel: პარალელური გზა - advanced_undelete: აღდგენა - advice_microblogged: თქვენი ახალი სტატუსია $1 - advice_uploadfail: ატვირთვა შეჩერდა - cancel: გაუქმება - closechangeset: რედაქტირების პაკეტის დახურვა - conflict_download: სხვისი ვერსიის ჩამოტვირთვა - conflict_overwrite: სხვის ვერსიაზე გადაწერა - conflict_visitpoi: დააჭირეთ 'Ok'–ს რათა იხილოთ წერტილი. - conflict_visitway: დააჭირეთ 'Ok'–ს რათა იხილოთ გზა. - createrelation: ახალი ურთიერთობის შექმნა - delete: წაშლა - deleting: იშლება - editinglive: რედაქტირება ცოცხლად - heading_drawing: ხატვა - help: დახმარება - hint_latlon: "გან $1\nგრძ $2" - inspector_latlon: "გან $1\nგრძ $2" - inspector_locked: დაბლოკილია - inspector_unsaved: არ შეინახა - loading: იტვირთება… - login_pwd: "პაროლი:" - login_title: შესვლა ვერ ხერხდება - login_uid: "მომხმარებლის სახელი:" - mail: ფოსტა - more: მეტი - "no": არა - nobackground: ფონის გარეშე - offset_motorway: ავტომაგისტრალი (D3) - ok: Ok - option_external: "გარე გაშვება:" - option_fadebackground: ნათელი ფონი - option_layer_cycle_map: OSM - ველოსიპედისტების რუკა - option_layer_maplint: OSM - Maplint (შეცდომები) - option_layer_ooc_25k: "ბრიტ. ისტორიული: 1:25000" - option_layer_ooc_7th: "ბრიტ. ისტორიული: მე-7" - option_layer_ooc_npe: "ბრიტ. ისტორიული: NPE" - option_layer_ooc_scotland: "ბრიტ. ისტორიული: შოტლანდია" - option_layer_os_streetview: "ბრიტ.: OS StreetView" - option_layer_streets_haiti: "ჰაიტი: ქუჩების სახელწოდებები" - option_layer_surrey_air_survey: "ბრიტ.: Surrey Air Survey" - option_microblog_id: "მიკრობლოგის სახელი:" - option_microblog_pwd: "მიკრობლოგის პაროლი:" - option_noname: უსახელო გზების გამოყოფა - option_photo: "ფოტო KML:" - option_thinareas: პოლიგონებისთვის წვრილი ხაზების გამოყენება - option_thinlines: წვრილი ხაზების გამოყენება ყველა მასშტაბში - option_tiger: შეუცვლელი TIGER–ის გამოყოფა - point: წერტილი - preset_icon_airport: აეროპორტი - preset_icon_bar: ბარი - preset_icon_bus_stop: ავტობუსის გაჩერება - preset_icon_cafe: კაფე - preset_icon_cinema: კინოთეატრი - preset_icon_convenience: მინიმარკეტი - preset_icon_disaster: ჰაიტის შენობები - preset_icon_fast_food: სწრაფი კვება - preset_icon_ferry_terminal: ბორანი - preset_icon_fire_station: სახანძრო განყოფილება - preset_icon_hospital: საავადმყოფო - preset_icon_hotel: სასტუმრო - preset_icon_museum: მუზეუმი - preset_icon_parking: ავტოსადგომი - preset_icon_pharmacy: აფთიაქი - preset_icon_police: პოლიციის განყოფილება - preset_icon_restaurant: რესტორანი - preset_icon_school: სკოლა - preset_icon_station: რკინიგზის სადგური - preset_icon_supermarket: სუპერმარკეტი - preset_icon_taxi: ტაქსის სადგომი - preset_icon_theatre: თეატრი - prompt_editlive: რედაქტირება ცოცხლად - prompt_savechanges: ცვლილებების შენახვა - prompt_welcome: კეთილი იყოს თქვენი მობრძანება OpenStreetMap-ში! - retry: გამეორება - revert: დააბრუნეთ - save: შენახვა - uploading: იტვირთება... - uploading_deleting_ways: გზების წაშლა - warning: გაფრთხილება! - way: გზა - "yes": დიახ diff --git a/config/potlatch/locales/ko.yml b/config/potlatch/locales/ko.yml deleted file mode 100644 index 98ed3870e..000000000 --- a/config/potlatch/locales/ko.yml +++ /dev/null @@ -1,90 +0,0 @@ -# Messages for Korean (한국어) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Ryuch -# Author: Wrightbus -ko: - a_way: $1 길 - action_addpoint: 길의 마지막에 새로운 node 추가 - action_cancelchanges: "변경 내용 취소:" - action_createpoi: POI 만들기 - action_deletepoint: 포인트를 삭제 - action_insertnode: 길에 node를 추가 - action_mergeways: 두 길을 합침(merge) - action_movepoi: POI 이동 - action_movepoint: 포인트를 이동 - action_moveway: 길을 이동중 - action_pointtags: 포인트의 태그를 설정 - action_poitags: POI의 태그를 설정 - action_splitway: 길을 나누기 - action_waytags: 길의 태그를 설정 - advanced_undelete: 되살리기 - advice_nocommonpoint: 길들이 같은 포인트를 공유하지 않았습니다. - advice_tagconflict: 태그가 일치하지 않습니다 -- 살펴보세요 - advice_toolong: unlock하기에 너무 깁니다. 길을 짧게 나누세요 - advice_uploadsuccess: 모든 데이터가 성공적으로 업로드되었습니다. - advice_waydragged: 길이 통째로 움직였습니다 (Z 키를 누르면 undo 됩니다) - cancel: 취소 - conflict_poichanged: 편집을 시작한 이후 다른 사람이 포인트 변경하였습니다 $1$2. - conflict_visitway: 길을 표시하려면 ' 확인'을 클릭하세요. - createrelation: 새로운 relation 생성 - delete: 삭제 - deleting: 삭제 - editinglive: 라이브 편집 - emailauthor: \n\n버그가 발견되면 richard\@systemeD.net 에게 email을 주십시오. 그리고 귀하가 무슨 작업을 하고 있는지 알려주세요. - error_connectionfailed: "죄송합니다. OpenStreetMap 서버와의 연결이 실패했습니다. 최근 변경사항은 저장되지 않았습니다\n\n접속을 다시 시도하겠습니까?" - error_microblog_long: "$1에 게시 실패 :\nHTTP 코드: $2\n오류 메시지 : $3\n$1 오류:$4" - error_nopoi: POI를 찾을 수 없습니다. (perhaps you've panned away?) so I can't undo. - error_nosharedpoint: 길 $1 과 $2 은(는) 같은 포인트를 더이상 공유하지 않습니다. 길 나누기를 취소할 수 없습니다. - error_noway: 길 $1 이 발견되지 않았습니다 (perhaps you've panned away?) so I can't undo. - gpxpleasewait: GPX 트랙로그가 처리될때 까지 기다려주세요. - help: 도움말 - hint_drawmode: 클릭하면 포인트를 추가\n더블 클릭 또는 리턴 키를 누르면\n라인을 끝냄 - hint_loading: 길을 가져옵니다 - hint_overendpoint: 마지막 포인트에서\n클릭하면 연결합니다\nshift-click하면 합칩니다. - hint_overpoint: 포인트를 클릭하면 연결합니다. - hint_pointselected: 포인트 선택됨\n(새로운 라인을 생성하려면\n포인트에서 shift-click하세요) - inspector_locked: 잠김 - inspector_uploading: (업로드) - norelations: 현재 영역에 relation이 없습니다. - offset_choose: 오프셋을 선택하십시오 (m) - ok: 확인 - option_custompointers: pen과 hand 마우스 포인터 사용 - option_fadebackground: 흐린 배경 - option_layer_maplint: OSM-Maplint (오류) - option_layer_nearmap: "호주: 근처지도" - option_layer_os_streetview: "UK: OS 거리모습" - option_layer_streets_haiti: "아이티: 거리 이름" - option_photo: "사진 KML:" - option_thinlines: 모든 축적에서 가는 선을 사용 - option_warnings: 부동 경고 표시 - point: 포인트 - preset_icon_airport: 공항 - preset_icon_cinema: 영화 - preset_icon_disaster: 아이티 건물 - preset_icon_ferry_terminal: 배 - preset_icon_fire_station: 소방서 - preset_icon_station: 철도 역 - preset_tip: $1을 설명 하는 미리 설정 된 태그의 메뉴에서 선택합니다 - prompt_addtorelation: relation에 $1 추가 - prompt_changesetcomment: "변경 사항에 대한 설명을 입력 :" - prompt_createparallel: 나란한 길 만들기 - prompt_revertversion: "이전에 저장된 버전으로 부터 되돌리기:" - prompt_taggedpoints: 길의 몇몇 포인트에 태그가 있습니다. 정말 삭제하겠습니까? - prompt_track: GPS tracklog를 수정가능한 길(locked)로 변환 - prompt_welcome: OpenStreetMap에 오신 것을 환영합니다! - save: 저장 - tip_addrelation: relation에 추가 - tip_addtag: 새로운 태그 추가 - tip_alert: 에러 발생 - 클릭하면 상세 내용 보기 - tip_anticlockwise: 시계반대방향 원형도로 - 클릭하면 방향 바꿈 - tip_clockwise: 시계방향 원형도로 - 클릭하면 방향 바꿈 - tip_direction: 길의 방향 - 클릭하면 방향 바꿈 - tip_gps: GPS 트랙 보이기 (G) - tip_noundo: undo할 것이 없음 - tip_options: 옵션 지정(지도 배경 선택) - tip_photo: 사진 가져오기 - tip_repeattag: 이전 선택된 도로의 태그들을 적용 (R) - tip_revertversion: "되돌릴 버전 선택:" - tip_splitway: 선택된 포인트에서 길을 나누기(split) (X) - way: 길 diff --git a/config/potlatch/locales/lb.yml b/config/potlatch/locales/lb.yml deleted file mode 100644 index fcf899eb6..000000000 --- a/config/potlatch/locales/lb.yml +++ /dev/null @@ -1,135 +0,0 @@ -# Messages for Luxembourgish (Lëtzebuergesch) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Robby -lb: - a_poi: $1 e POI - a_way: $1 ee Wee - action_changeway: Ännerunge vun engem Wee - action_deletepoint: e Punkt läschen - action_mergeways: Zwee Weeër zesummeleeën - action_movepoint: e Punkt réckelen - action_moveway: e Wee réckelen - action_splitway: e Wee opdeelen - advanced: Erweidert - advanced_history: Chronik vum Wee - advanced_inspector: Inspekter - advanced_maximise: Fënster maximéieren - advanced_minimise: Fënster minimiséieren - advanced_parallel: Parallele Wee - advanced_undelete: Restauréieren - advice_conflict: Server-Konflikt - et ka sinn datt Dir nach emol versiche musst fir ofzespäicheren - advice_deletingway: Wee läschen (Z fir z'annulléieren) - advice_microblogged: Äre(n) $1-Status gouf aktualiséiert - advice_uploadempty: Näischt fir eropzelueden - advice_uploadfail: Eropluede gestoppt - advice_uploadsuccess: All Donnéeë sinn eropgelueden - cancel: Ofbriechen - conflict_download: Hir Versioun eroflueden - conflict_overwrite: Hir Versioun iwwerschreiwen - conflict_visitway: Klickt 'OK' fir de Wee ze weisen. - createrelation: Eng nei Relatioun festleeën - custom: "Personaliséiert:" - delete: Läschen - deleting: läschen - editinglive: Live änneren - editingoffline: Offline änneren - error_anonymous: En anonyme Mapper kann net kontaktéiert ginn. - heading_drawing: Zeechnen - heading_introduction: Aféierung - heading_pois: Ufänken - help: Hëllef - hint_loading: Donnéeë lueden - hint_saving: Donnéeë späicheren - hint_saving_loading: Donnéeë lueden/späicheren - inspector: Inspekter - inspector_duplicate: Doublon vu(n) - inspector_in_ways: Op de Weeër - inspector_locked: Gespaart - inspector_node_count: ($1 mol) - inspector_unsaved: Net gespäichert - inspector_uploading: (eroplueden) - inspector_way_nodes: $1 Kniet - loading: Lueden... - login_pwd: "Passwuert:" - login_retry: Äre Login op de site gouf net erkannt. Probéiert w.e.g. nach emol. - login_uid: "Benotzernumm:" - mail: Noriicht - more: Méi - "no": Neen - nobackground: Keen Hannergrond - offset_motorway: Autobunn (D3) - offset_narrowcanal: Schmuele Pad laanscht e Kanal - ok: OK - option_fadebackground: Halleftransparenten Hannergrond - option_layer_cycle_map: OSM - Vëloskaart - option_layer_nearmap: "Australien: NearMap" - option_layer_os_streetview: "UK : OS StreetView" - option_layer_streets_haiti: "Haiti: Stroossennimm" - option_microblog_id: "Microblog-Numm:" - option_microblog_pwd: "Microblog-Passwuert:" - option_photo: "Foto-KML:" - option_thinlines: Dënn Linnen an all Gréisste benotzen - point: Punkt - preset_icon_airport: Fluchhafen - preset_icon_bar: Bar - preset_icon_bus_stop: Busarrêt - preset_icon_cafe: Café - preset_icon_cinema: Kino - preset_icon_convenience: Epicerie - preset_icon_disaster: Haiti Gebai - preset_icon_fast_food: Fastfood - preset_icon_ferry_terminal: Fähr - preset_icon_fire_station: Pomjeeën - preset_icon_hospital: Klinik - preset_icon_hotel: Hotel - preset_icon_museum: Musée - preset_icon_parking: Parking - preset_icon_pharmacy: Apdikt - preset_icon_police: Policebüro - preset_icon_post_box: Bréifboîte - preset_icon_pub: Bistro - preset_icon_recycling: Recyclage - preset_icon_restaurant: Restaurant - preset_icon_school: Schoul - preset_icon_station: Gare - preset_icon_supermarket: Supermarché - preset_icon_taxi: Taxistand - preset_icon_telephone: Telefon - preset_icon_theatre: Theater - prompt_addtorelation: $1 bäi eng Relatioun derbäisetzen - prompt_changesetcomment: "Gitt eng Beschreiwung vun Ären Ännerungen:" - prompt_createparallel: E parallele Wee uleeën - prompt_editlive: Live änneren - prompt_editsave: Mat späicheren änneren - prompt_helpavailable: Neie Benotzer? Kuckt ënne lenks fir Hëllef. - prompt_launch: Extern URL opmaachen - prompt_revertversion: "Op eng méi fréi gespäichert Versioun zerécksetzen:" - prompt_savechanges: Ännerunge späicheren - prompt_unlock: Klickt fir d'Spär opzehiewen - prompt_welcome: Wëllkomm op OpenStreetMap! - retry: Nach eng Kéier probéieren - revert: Zrécksetzen - save: Späicheren - tags_backtolist: Zréck op d'Lëscht - tags_descriptions: Beschreiwunge vu(n) '$1' - tags_typesearchterm: "Tippt e Wuert fir ze sichen:" - tip_addrelation: Bäi eng Relatioun derbäisetzen - tip_alert: Et ass e Feeler geschitt - klickt hei fir weider Detailer - tip_noundo: Näischt wat annuléiert ka ginn - tip_options: Optiounen astellen (Sicht den Hannergrond vun der Kaart eraus) - tip_photo: Fotoe lueden - tip_selectrelation: De gewielte Wee derbäisetzen - tip_splitway: Wee op dem erausgesichte Punkt (X) opdeelen - tip_undo: $1 réckgängeg maachen (Z) - uploading: Eroplueden... - uploading_deleting_ways: Weeër läschen - uploading_poi: POI $1 eroplueden - uploading_poi_name: POI $1, $2 eroplueden - uploading_relation: Realtioun $1 eroplueden - uploading_relation_name: Relatioun $1, $2 eroplueden - uploading_way: Wee $1 eroplueden - uploading_way_name: Wee $1, $2 eroplueden - warning: Warnung - way: Wee - "yes": Jo diff --git a/config/potlatch/locales/lolcat.yml b/config/potlatch/locales/lolcat.yml deleted file mode 100644 index 18cb0f350..000000000 --- a/config/potlatch/locales/lolcat.yml +++ /dev/null @@ -1,65 +0,0 @@ -lolcat: - a_poi: $1 A plase - a_way: $1 a wai - action_addpoint: addin a noeded ta teh end uv a wai - action_cancelchanges: cancellin chanzes ta - action_createpoi: creatin a plase - action_deletepoint: deletin a noed - action_insertnode: addin a noeded into a wai - action_mergeways: mergin bowf waiz - action_movepoi: movin a plase - action_movepoint: movin a point - action_moveway: movin a wai - action_pointtags: In ur noed, settin teh tagz - action_poitags: In ur plase, settin teh tagz - action_reverseway: reversin a wai - action_splitway: spleettin a wai - action_waytags: In ur wai, settin teh tagz - advice_nocommonpoint: seez floaty warnz? - advice_tagconflict: teh wais haz noes joins! - advice_toolong: oh noes! wai iz veeeri big! splitz it! - advice_waydragged: Wai iz draggeded (Z undoz) - cancel: Noes! - createrelation: Creaet a noo relashun - delete: Deleet - deleting: deletin - emailauthor: \n\NPLEAES e-male richard\@systemed.net wif a bug report, meaowin whut yoo werz doin at teh tyme. - error_connectionfailed: "OHNOES! teh OPENSTREETMAP servah connecshun has a FAIL. I no saveded n e recent chanzes.\n\nYoo wants tri agin?" - error_nopoi: I had a plase but I losteded it, so noes can undo. :( - error_nosharedpoint: waiz $1 adn $2 dun shaer a common point n e moar , sow I noes kan undo teh spleet. - error_noway: I had a wai $1 but I losteded it, so noes can undo. :( - existingrelation: Adds ta a relashun - findrelation: Luks for a relashun wif - gpxpleasewait: Pleez wayt whiel teh GPZ track iz processeded. - help: Halp - hint_drawmode: clik ta add point\ndouble-clik/Return\nto end lien - hint_loading: NOM NOM NOM - hint_overendpoint: ovah endpoint\nclik ta join\nshift-clik ta merge - hint_overpoint: "I'M OVAH UR POINT\nCLICKIN TO JOIN" - hint_pointselected: point selecteded\n(shift-clik point ta\nstaart new lien) - norelations: I sees noes relashuns neer heer - ok: kthx - option_custompointers: I can has pen adn paw pointerz - option_fadebackground: Faeded bakground - option_thinlines: I can has thin linez at awl scalez - point: Noed - prompt_addtorelation: Add $1 ta a relashun - prompt_revertversion: plz to chooes vershun - prompt_taggedpoints: sum uv teh pointz awn dis wai iz taggeded. reelee deleet? - prompt_track: Convert yur GPZ track ta (lockeded) waiz foar editin. - prompt_welcome: welcum ta OPENSTREETMAP! - tip_addrelation: Add ta a relashun - tip_addtag: Noo tag - tip_alert: OHNOES! Errorz! - clik foar detailz - tip_anticlockwise: Anti-clockwyez circlar wai - clik ta bakwadz - tip_clockwise: Clockwyez circlar wai - clik ta bakwadz - tip_direction: Direcshun uv wai - clik ta bakwadz - tip_gps: Can haz GPZ trax (G) - tip_noundo: I haz nuffin for undos - tip_options: Set optionz (chooes teh map bakgrownd) - tip_presettype: Chooes whut tyep uv presetz iz ofered in teh menu. - tip_repeattag: Previous tagz ar relavint to mai selecteded wai (R) - tip_revertversion: Chooes teh verzhun ta revert ta - tip_selectrelation: Add ta teh chosen rouet - tip_splitway: wai goes NOM NOM NOM at the noed (X) - way: Wai diff --git a/config/potlatch/locales/lt.yml b/config/potlatch/locales/lt.yml deleted file mode 100644 index 1b506702f..000000000 --- a/config/potlatch/locales/lt.yml +++ /dev/null @@ -1,187 +0,0 @@ -# Messages for Lithuanian (Lietuvių) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Eitvys200 -# Author: Ignas693 -# Author: Matasg -# Author: Pdxx -# Author: Perkunas -lt: - a_poi: $1 yra lankytina vieta (POI) - a_way: $1 yra kelias - action_addpoint: pridedama sankirta kelio gale - action_cancelchanges: panaikinami keitimai - action_changeway: pakeičia į kelią - action_createparallel: kuria lygiagrečius kelius - action_createpoi: kuria lankytiną vietą - action_deletepoint: trina tašką - action_insertnode: į kelią įdedama sankirta - action_mergeways: sujungiami keliai - action_movepoi: perkeliama lankytina vieta - action_movepoint: perkeliamas taškas - action_moveway: perkeliamas kelias - action_pointtags: taškui nustatomos žymės - action_poitags: lankytinai vietai nustatomos žymės - action_reverseway: keliui nustatoma atbulinė eiga - action_revertway: atstatomas kelias - action_splitway: kelias suskaidomas - action_waytags: keliui nustatomos žymės - advanced: Išplėstinis - advanced_close: Uždaryti pakeitimus - advanced_history: Kelio istorija - advanced_inspector: Tikrintojas - advanced_maximise: Padidinti langą - advanced_minimise: Sumažinti langą - advanced_parallel: Lygiagretus kelias - advanced_tooltip: Išplėstiniai redagavimo veiksmai - advanced_undelete: Atkurti - advice_bendy: Per daug išlenktas, kad būtų galima ištiesinti (spauskite SHIFT, jei vis dar norite atlikti veiksmą) - advice_conflict: Serverio konfliktas - pabandykite išsaugoti dar kartą - advice_deletingpoi: Ištrinama lankytina vieta (spauskite Z, norėdami atšaukti) - advice_deletingway: Naikinamas kelias (spauskite Z, norėdami atšaukti) - advice_microblogged: Atnaujintas jūsų $1 statusas - advice_nocommonpoint: Keliai neturi bendro taško - advice_revertingpoi: Atkuriama į paskutinę įrašytą lankytiną vietą (spauskite Z, jei norite atšaukti) - advice_revertingway: Atkuriama į paskutinį įrašytą kelią (spauskite Z, jei norite atšaukti) - advice_tagconflict: Žymos nesutampa - patikrinkite (spauskite Z, norėdami atšaukti) - advice_toolong: Per ilgas, kad būtų galima atrakinti - prašome suskirstyti į trumpesnius kelius. - advice_uploadempty: Nieko, ką įkelti - advice_uploadfail: Įkėlimas sustabdytas - advice_uploadsuccess: Visi duomenys sėkmingai įkelti - advice_waydragged: Kelias nutemptas (spauskite Z, norėdami atšaukti) - cancel: Atšaukti - closechangeset: Uždaryti pakeitimus - conflict_download: Atsisiųsti kitą versiją - conflict_overwrite: Priverstinai įrašyti savo versiją - conflict_poichanged: Kol redagavote, kažkas pakeitė tašką $1$2. - conflict_relchanged: Kol redagavote, kažkas pakeitė ryšį $1$2. - conflict_visitpoi: Spustelėkite "Gerai", kad taškas būtų parodytas. - conflict_visitway: Spustelėkite "Gerai", kad kelias būtų parodytas. - conflict_waychanged: Kol redagavote, kažkas pakeitė kelią $1$2. - createrelation: Sukurti naują ryšį - custom: "Pasirinktinis:" - delete: Ištrinti - deleting: trinama - drag_pois: Vilkite ir numeskite lankytinas vietas - editinglive: Redaguojama gyvai - editingoffline: Redaguojama neprisijungus - emailauthor: \n\nKreipkitės į richard@systemeD.net ir praneškite, ką tuo metu darėte. - error_anonymous: Jūs negalite susisiekti su anoniminiu žemėlapių kūrėju. - error_connectionfailed: Atsiprašome - ryšys su OpenStreetMap serverio nutrūko. Naujausi pakeitimai nebuvo išsaugoti. \n\nNorite pabandyti dar kartą? - error_microblog_long: "Pranešimų siuntimas į $1 nepavyko:\nHTTP kodas: $2\nKlaidos pranešimas: $3\n$1 error: $4" - existingrelation: Pridėti į esamą ryšį - findrelation: Rasti ryšį, kurio sudėtyje yra - gpxpleasewait: Palaukite, kol GPX pėdsakas yra tvarkomas. - heading_drawing: Brėžinys - heading_introduction: Įvadas - heading_pois: Pradžia - heading_quickref: Greita nuoroda - heading_surveying: Topografijos - heading_tagging: Žymėjimas - heading_troubleshooting: Trikčių - help: Pagalba - hint_drawmode: spustelėkite, jei norite pridėti punktas \ ndouble-click/Return \ nesibaigia linija - hint_latlon: "plat $1\nilg $2" - hint_loading: įkeliami duomenys - hint_overendpoint: per tašką ( $1 ) \ nKliknij prisijungti prie \ nshift spustelėkite, jei norite sujungti - hint_overpoint: per tašką ( $1 ) \ nKliknij prisijungti - hint_pointselected: punkte, \ n (pamainos spustelėkite žymeklį \ nstart naują eilutę) - hint_saving: įrašomi duomenys - hint_saving_loading: įkeliami/įrašomi duomenys - inspector: Inspektorius - inspector_duplicate: Dublikatas - inspector_in_ways: Būdais - inspector_latlon: "Plat $1\nIlg $1" - inspector_locked: Užrakintas - inspector_node_count: ( $1 kartų) - inspector_not_in_any_ways: Ne jokiais būdais (LV) - inspector_unsaved: Neįrašyta - inspector_uploading: (Įkelti) - inspector_way_connects_to: Prisijungia prie $1 būdai - inspector_way_connects_to_principal: Prisijungia prie $1 $2 ir $3 kitas $4 - inspector_way_nodes: $1 mazgai - inspector_way_nodes_closed: $1 mazgų (uždaras) - loading: Kraunama... - login_pwd: "Slaptažodis:" - login_retry: Svetainė neatpažino Jūsų. Bandykite dar kartą. - login_title: Nepavyko prisijungti - login_uid: "Vartotojo vardas:" - mail: Paštas - more: Daugiau - newchangeset: "Bandykite dar kartą: Potlatch pradės naują pakeitimą." - "no": Ne - nobackground: Be fono - norelations: Šiame plote nėra ryšių - offset_choose: Parinkite poslinkį (m) - ok: Gerai - openchangeset: Atidaromas pakeitimas - option_custompointers: Naudokites rašikliu ir rankiniu žymekliu. - option_layer_cycle_map: OSM - dviračių žemėlapis - option_layer_maplint: OSM - žemėlapio dulkės (klaidos) - option_layer_nearmap: "Australija: NearMap" - option_layer_ooc_25k: "JK istorinis: 1:25 k" - option_layer_ooc_7th: "JK istorinis: 7-asis" - option_layer_streets_haiti: "Haitis: gatvių pavadinimai" - option_limitways: Perspėti mane, kai kraunama daug duomenų - option_microblog_id: "Microblog vardas:" - option_microblog_pwd: "Microblog slaptažodis:" - option_noname: Paryškinti kelius be pavadinimų - option_photo: KML nuotrauka - option_thinareas: Naudoti plonesnes linijas tam tikrose srityse - option_thinlines: Naudoti plonas linijas visose skalėse. - option_tiger: Paryškinti nepakeistą TIGER - option_warnings: Rodyti iššokančius įspėjimus - point: Taškas - preset_icon_airport: Oro uostas - preset_icon_bar: Baras - preset_icon_bus_stop: Autobusų stotelė - preset_icon_cafe: Kavinė - preset_icon_cinema: Kino teatras - preset_icon_disaster: Pastatas Haityje - preset_icon_fast_food: Greitas maistas - preset_icon_ferry_terminal: Keltas - preset_icon_fire_station: Gaisrinė - preset_icon_hospital: Ligoninė - preset_icon_hotel: Viešbutis - preset_icon_museum: Muziejus - preset_icon_parking: Automobilių stovėjimo aikštelė - preset_icon_pharmacy: Vaistinė - preset_icon_place_of_worship: Maldos namai - preset_icon_police: Policijos nuovada - preset_icon_post_box: Pašto dėžutė - preset_icon_pub: Aludė - preset_icon_recycling: Perdirbimas - preset_icon_restaurant: Restoranas - preset_icon_school: Mokykla - preset_icon_station: Geležinkelio stotis - preset_icon_supermarket: Prekybos centras - preset_icon_taxi: Taksi stovėjimo aikštelė - preset_icon_telephone: Telefonas - preset_icon_theatre: Teatras - prompt_addtorelation: Pridėti $1 į ryšį - prompt_changesetcomment: "Įrašykite jūsų keitimų aprašymą:" - prompt_closechangeset: Uždaras keitimas $1 - prompt_createparallel: Sukurti paralelinį kelią - prompt_editlive: Redaguoti gyvai - prompt_editsave: Redaguoti su išsaugojimu - prompt_helpavailable: Naujas vartotojas? Žiūrėkite apatiniame kairiajame krante dėl pagalbos. - prompt_launch: Paleisti išorinį URL - prompt_live: Redagavimo gyvai režime, kiekvieną pakeitimą kurį jūs atliksite, išsisaugos automatiškai - tai nerekomenduojama pradedantiesiems. Ar tu tikras? - prompt_revertversion: "Atstatyti ankstesnę įrašytą versiją:" - prompt_welcome: Jus sveikina OpenStreetMap! - retry: Bandyti dar kartą - save: Įrašyti - tags_backtolist: Atgal į sąrašą - tags_findatag: Rasti žymą - tags_findtag: Rasti žymą - tip_addrelation: Pridėti į ryšį - tip_addtag: Pridėti naują žymą - tip_alert: Įvyko klaida - spauskite, kad gautumėte daugiau informacijos - tip_gps: Rodyti GPS pėdsakus (G) - tip_photo: Įkelti nuotraukas - uploading: Įkeliama... - uploading_deleting_pois: Trinami taškai - uploading_deleting_ways: Trinami keliai - uploading_poi: Įkeliamas POI $1 - uploading_poi_name: Įkeliamas POI $1, $2 - warning: Įspėjimas! diff --git a/config/potlatch/locales/lv.yml b/config/potlatch/locales/lv.yml deleted file mode 100644 index c41eb8723..000000000 --- a/config/potlatch/locales/lv.yml +++ /dev/null @@ -1,88 +0,0 @@ -# Messages for Latvian (Latviešu) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Karlis -# Author: Papuass -lv: - action_moveway: ceļa pārvietošana - advanced_history: Ceļa vēsture - advanced_inspector: Inspektors - advanced_maximise: Maksimizēt logu - advanced_minimise: Samazināt logu - advice_uploadfail: Augšupielāde pārtraukta - cancel: Atcelt - conflict_download: Lejupielādēt viņu versiju - delete: Dzēst - deleting: dzēš - editingoffline: Rediģēšana bezsaistē - heading_drawing: Zīmējums - heading_introduction: Ievads - heading_quickref: Ātrā uzziņa - heading_troubleshooting: Problēmu risināšana - help: Palīdzība - hint_loading: ielādē datus - inspector: Inspektors - inspector_node_count: ($1 reizes) - inspector_unsaved: Nesaglabāts - inspector_uploading: (augšupielādē) - loading: Ielādē… - login_pwd: "Parole:" - login_title: Neizdevās pieslēgties - login_uid: "Lietotājvārds:" - mail: Pasts - more: Vairāk - "no": Nē - nobackground: Nav fona - offset_choose: Izvēlieties nobīdi (m) - ok: Ok - option_layer_maplint: OSM - Maplint (kļūdas) - option_layer_nearmap: "Austrālija: NearMap" - option_layer_streets_haiti: "Haiti: ielu nosaukumi" - option_microblog_id: "Mikrobloga nosaukums:" - option_microblog_pwd: "Mikrobloga parole:" - option_noname: Izcelt nenosauktās ielas - option_photo: "Foto KML:" - option_thinareas: Lietot šaurākas līnijas apgabaliem - point: Punkts - preset_icon_airport: Lidosta - preset_icon_bar: Bārs - preset_icon_bus_stop: Autobusu pietura - preset_icon_cafe: Kafejnīca - preset_icon_cinema: Kino - preset_icon_disaster: Haiti ēka - preset_icon_fast_food: Ātrā ēdināšana - preset_icon_ferry_terminal: Prāmis - preset_icon_fire_station: Ugunsdzēsēju depo - preset_icon_hospital: Slimnīca - preset_icon_hotel: Viesnīca - preset_icon_museum: Muzejs - preset_icon_parking: Autostāvvieta - preset_icon_pharmacy: Aptieka - preset_icon_place_of_worship: Dievnams - preset_icon_police: Policijas iecirknis - preset_icon_post_box: Pastkastīte - preset_icon_pub: Krogs - preset_icon_restaurant: Restorāns - preset_icon_school: Skola - preset_icon_station: Dzelzceļa stacija - preset_icon_supermarket: Lielveikals - preset_icon_telephone: Taksofons - preset_icon_theatre: Teātris - prompt_addtorelation: Pievienot $1 relācijai - prompt_changesetcomment: "Ievadiet izmaiņu aprakstu:" - prompt_editlive: Labot uzreiz - prompt_editsave: Labot ar saglabāšanu - prompt_savechanges: Saglabāt izmaiņas - prompt_unlock: Noklikšķiniet, lai atbloķētu - prompt_welcome: Laipni lūgti OpenStreetMap! - retry: Mēģināt vēlreiz - save: Saglabāt - tags_backtolist: Atpakaļ uz sarakstu - tip_addrelation: Pievienot relācijai - tip_noundo: Nav darbības, ko atcelt - tip_selectrelation: Pievienot izvēlētajam maršrutam - uploading: Augšupielādē... - uploading_way: Augšupielādē ceļu $1 - warning: Brīdinājums! - way: Līnija - "yes": Jā diff --git a/config/potlatch/locales/mk.yml b/config/potlatch/locales/mk.yml deleted file mode 100644 index 988be893a..000000000 --- a/config/potlatch/locales/mk.yml +++ /dev/null @@ -1,239 +0,0 @@ -# Messages for Macedonian (Македонски) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Bjankuloski06 -mk: - a_poi: $1 точка од интерес (POI) - a_way: $1 пат - action_addpoint: додавање јазол на крај на пат - action_cancelchanges: откажување на промените на - action_changeway: промени на пат - action_createparallel: создавање паралелни патишта - action_createpoi: создавање на точки од интерес (POI) - action_deletepoint: бришење на точка - action_insertnode: додавање јазол на пат - action_mergeways: спојување на два пата - action_movepoi: преместување на точки од интерес (POI) - action_movepoint: преместување на точка - action_moveway: преместување на пат - action_pointtags: местење ознаки на точка - action_poitags: поставање ознаки на точка од интерес (POI) - action_reverseway: обратно насочување на пат - action_revertway: враќање на патека - action_splitway: разделување на пат - action_waytags: поставање ознаки на пат - advanced: Напредно - advanced_close: Затвори менување - advanced_history: Историја на патот - advanced_inspector: Инспектор - advanced_maximise: Зголеми го прозорецот - advanced_minimise: Смали го прозорецот - advanced_parallel: Паралелен пат - advanced_tooltip: Напредни можности за уредување - advanced_undelete: Врати бришено - advice_bendy: Премногу искривено за да се исправи (SHIFT за насила) - advice_conflict: Конфликт во опслужувачот - можеби ќе треба да зачувате повторно - advice_deletingpoi: Бришење на точка од интерес (POI) (Z за враќање) - advice_deletingway: Бришење пат (Z за враќање) - advice_microblogged: Вашиот нов статус - $1 - advice_nocommonpoint: Патиштата немаат заедничка точка - advice_revertingpoi: Враќање на последната зачувана точка од интерес (POI) (Z за враќање) - advice_revertingway: Врати на последен зачуван пат (Z за враќање) - advice_tagconflict: Ознаките не се совпаѓаат - проверете (Z за враќање) - advice_toolong: Предолго за отклучување - разделувајте на пократки патеки - advice_uploadempty: Нема што да се подигне - advice_uploadfail: Подигањето запре - advice_uploadsuccess: Сите податоци се успешно подигнати - advice_waydragged: Патот е извлечен (Z за враќање) - cancel: Откажи - closechangeset: Затворање на измените - conflict_download: Преземете ја таа верзија - conflict_overwrite: Запиши врз таа верзија - conflict_poichanged: Додека уредувавте, некој друг ја сменил точката $1$2. - conflict_relchanged: Додека уредувавте, некој друг ја изменил релацијата $1$2 - conflict_visitpoi: Кликнете на 'Ок' за да се прикаже точката. - conflict_visitway: Кликнете на „Ок“ за да ви се прикаже патот. - conflict_waychanged: Додека уредувавте, некој друг го променил патот $1$2. - createrelation: Создај нова релација - custom: "Прилагодено:" - delete: Избриши - deleting: бришење - drag_pois: Влечење и пуштање на точки од интерес - editinglive: Уредување во живо - editingoffline: Уреди вонмрежно - emailauthor: \n\nПишете на richard\@systemeD.net за да пријавите бубачка, и кажете што правевте кога се јави проблемот. - error_anonymous: Не можете да контактирате анонимен картограф. - error_connectionfailed: Се извинуваме - падна врската со опслужувачот на OpenStreetMap. Скорешните промени не се зачувани.\n\nДа пробам пак? - error_microblog_long: "Испраќањето во $1 не успеа:\nHTTP код: $2\nСоопштение за грешката: $3\n$1 грешка: $4" - error_nopoi: Не можев да ја најдам точката од интерес (POI) (можеби сте се оддалечиле со екранот?) и затоа не можам да вратам. - error_nosharedpoint: Патиштата $1 и $2 повеќе немаат заедничка точка, па затоа не можам да го отстранам разделот. - error_noway: Патот $1 не беше најден (можеби сте се оддалечиле со екранот?) и затоа не можам да вратам. - error_readfailed: Нажалост опслужувачот на OpenStreetMap не одговара на барањата за податоци.\n\nДа пробам пак? - existingrelation: Додај кон постоечка релација - findrelation: Пронајди релација што содржи - gpxpleasewait: Почекајте додека се обработи GPX патеката. - heading_drawing: Цртање - heading_introduction: Вовед - heading_pois: Како да почнете - heading_quickref: Кратка помош - heading_surveying: Истражување - heading_tagging: Означување - heading_troubleshooting: Отстранување неисправности - help: Помош - help_html: "Добредојдовте во Potlatch\nPotlatch е уредник на OpenStreetMap кој е лесен за употреба. Цртајте патишта, знаменитости, споменици и продавници од вашите GPS податоци, сателитски слики или стари карти.\n\nОвие страници за помош ќе ве запознаат со основите на користење на Potlatch, и ќе ви покажат каде можете да дознаете повеќе. Кликнете на насловите погоре за да почнете.\n\nЗа да излезете, кликнете било каде вон прозорецов.\n\n\n\nКорисно да се знае\nНе копирајте од други карти!\n\nАко изберете „Уредување во живо“, сите промени кои ќе ги направите одат на базата додека ги цртате - т.е. веднаш. Ако не сте толку сигурни во промените, одберете „Уредување со зачувување“, и така промените ќе се појават дури кога ќе стиснете на „Зачувај“.\n\nСите направени уредувања ќе се покажат по час-два (на неколку посложени работи им треба една недела). На картата не е прикажано сè - тоа би бил голем неред. Бидејќи податоците на OpenStreetMap се отворен извор, другите корисници слободно прават карти на кои се прикажани различни аспекти - како OpenCycleMap (Отворена велосипедска карта) или Midnight Commander.\n\nЗапомнете дека ова е и убава карта (затоа цртајте убави криви линии за кривините), но и дијаграм (затоа проверувајте дека патиштата се среќаваат на крстосници) .\n\nДали ви споменавме дека не смее да се копира од други карти?\n\n\nДознајте повеќе\nПрирачник за Potlatch\nПоштенски списоци\nРазговори (помош во живо)\nФорум\nВики на заедницата\nИзворен код на Potlatch\n\n\n\nКако да почнете\nСега Potlatch ви е отворен. Кликнете на „Уреди и зачувај“ за да почнете\n\nЗначи спремни сте да нацртате карта. Најлесно е да се почне со поставење на точки од интерес на картата (POI). Овие можат да бидат ресторани, цркви, железнички станици...сè што сакате.\n\nВлечење и пуштање\nЗа да ви олесниме, ги поставивме најчестите видови на точки од интерес (POI), на дното од картата. На картата се ставаат со нивно повлекување и пуштање на саканото место. И не грижете се ако не сте го погодиле местото од прв пат: можете точките да повлекувате повторно, сè додека не ја наместите секоја точка кадешто сакате.\n\nКога сте готови со тоа, ставете му име на ресторанот (или црквата, станицата итн.) На дното ќе се појави мала табела. Една од ставките ќе биде „име“, и до него „(тука внесете име)“. Кликнете на тој текст и впишете го името.\n\nКликнете другде на картата за да го одизберете вашата точка од интерес (POI), и така ќе се врати малиот шарен правоаголник.\n\nЛесно е, нели? Кликнете на „Зачувај“ (најдолу-десно) кога сте готови.\nДвижење по картата\nЗа да отидете на друг дел од картата, само повлечете празен простор. Potlatch автоматски ќе вчита нови податоци (гледајте најгоре-десно)\n\nВи рековме да „Уредите и зачувате“, но можете и да кликнете на „Уредување во живо“. Под овој режим промените одат право во базата, и затоа нема копче „Зачувај“. Ова е добро за брзи промени и картографски акции.\n\nСледни чекори\nЗадоволни сте од досегашното? Одлично. Кликнете на „Истражување“ погоре за да дознаете како да бидете вистински картограф!\n\nИстражување со GPS\nИдејата позади OpenStreetMap е создавање на карта без ограничувачките авторски права кои ги имаат други карти. Ова значи дека овдешните карти не можете да ги копирате од никаде: морате самите да ги истражите улиците. За среќа, ова е многу забавно!\nНајдобро е да се земе рачен GPS-уред. Пронајдете некој регион кој сè уште не е на картата. Прошетајте по улиците, или извозете ги на велосипед, држајќи го уредот вклучен. По пат запишувајте ги имињата на улиците, и сето она што ве интересира (ресторани? цркви?).\n\nКога ќе дојдете дома, вашиот GPS-уред ќе содржи т.н. „записник на траги“ (tracklog) кој има евиденција за секаде кадешто сте биле. Потоа ова можете да го подигнете на OpenStreetMap.\n\nНајдобриот вид на GPS-уред е оној што запишува често (на секоја секунда-две) и има големо памтење. Голем дел од нашите картографи користат рачни Garmin апарати, или Bluetooth-уреди. На нашето вики ќе најдете подробни анализа на GPS-уреди\n\nПодигање на патеката\nСега ќе треба да ја префрлите трагата од GPS-уредот. Можеби уредот има своја програмска опрема, или пак од него поже да се копираат податотеки предку USB. Ако не може, пробајте го GPSBabel. Како и да е, податотеката во секој случај треба да биде во GPX формат.\n\nПотоа одете на „GPS траги“ и подигнете ја трагата на OpenStreetMap. Но ова е само првиот чекор - трагата сè уште нема да се појави на картата. Морате самите да ги нацртате и именувате улиците, следејќи ја трагата.\nКористење на трагата\nПронајдете ја вашата подигната трага во списокот на „GPS траги“ и кликнете на „уреди“ веднаш до неа. Potlatch ќе започне со оваа вчитана трага, плус ако има патни точки. Сега можете да цртате!\n\nМожете и да кликнете на ова копче за да ви се прикажат GPS трагите на сите корисници (но не патните точки) за тековниот реон. Држете Shift за да се прикажат само вашите траги.\nКористење на сателитски слики\nНе грижете се ако немате GPS-уред. Во некои градови имаме сателитски фотографии врз кои можете да цртате, добиени со поддршка од Yahoo! (благодариме!). Излезете и запишете ги имињата на улиците, па вратете се и исцртајте ги линиите врз нив.\n\nДоколку не гледате сателитски слики, кликнете на копчето за прилагодувања и проверете дали е одбрано „Yahoo!“ Ако сè уште не ги гледате, тогаш веројатно такви слики се недостапни за вашиот град, или пак треба малку да оддалечите.\n\nНа истово копче за прилагодувања има и други избори како карти на Британија со истечени права и OpenTopoMap. Сите тие се специјално избрани бидејќи ни е дозволено да ги користиме- не копирајте ничии карти и воздушни фотографии (Законите за авторски права се за никаде.)\n\nПонекогаш сателитските слики се малку разместени од фактичката местоположба на патиштата. Ако наидете на ова, држете го Space и влечете ја позадината додека не се порамнат. Секогаш имајте доверба во GPS трагите, а не сателитските слики.\n\nЦртање патишта\nЗа да нацртате пат почнувајќи од празен простор на картата, само кликнете таму; потоа на секоја точка на патот. Кога сте готови, кликнете два пати или притиснете Enter - потоа кликнете на некое друго место за да го одизберете патот.\n\nЗа да нацртате пат почнувајќи од друг пат, кликнете на патот за да го изберете; неговите точки ќе станат црвени. Држете Shift и кликнете на една од нив за да започнете нов пат од таа точка. (Ако нема црвена точка на крстосницата, направете Shift-клик за да се појави кадешто сакате!)\n\nКликнете на „Зачувај“ (најдолу-десно) кога сте готови. Зачувувајте често, во случај да се јават проблеми со опслужувачот.\n\nНе очекувајте промените веднаш да се појават на главната карта. За ова треба да поминат час-два, а во некои случаи и до една недела.\nПравење крстосници\nМногу е важно патиштата да имаат заедничка точка („јазол“) кадешто се среќаваат. Ова им служи на корисниците кои планираат пат за да знаат каде да свртат.\n\nPotlatch се грижи за ова доколку внимателно кликнете точно на патот кој го сврзувате. Гледајте ги олеснителните знаци: точките светнуваат сино, курсорот се менува, и кога сте готови, точката на крстосницата има црна контура.\nПоместување и бришење\nОва работи баш како што се би се очекувало. За да избришете точка, одберете ја и притиснете на Delete. За да избришете цел еден пат, притиснете Shift-Delete.\n\nЗа да поместите нешто, само повлечете го. (Ќе треба да кликнете и да подржите малку пред да влечете. Со ова се избегнуваат ненамерни поместувања.)\nПонапредно цртање\nАко два дела од еден пат имаат различни имиња, ќе треба да ги раздвоите. Кликнете на патот; потоа кликнете во точката кадешто сакате да го раздвоите, и кликнете на ножиците. (Можете да спојувате патишта со Control, или копчето со јаболко на Мекинтош, но не спојувајте два пата со различни имиња или типови.)\n\nКружните текови се многу тешки за цртање. Но за тоа помага самиот Potlatch. Нацртајте го кругот грубо, само внимавајте да ги споите краевите (т.е. да биде круг), и кликнете на „подреди“. (Ова се користи и за исправање на патишта.)\nТочки од интерес (POI)\nПрвото нешто што го научивте е како да влечете и пуштате точка од интерес. Можете и самите да правите вакви точки со двојно кликнување на картата: ќе се појави зелено кругче. Но како ќе знаеме дали се работи за ресторан, црква или нешто друго? Кликнете на „Означување“ погоре за да дознаете!\n\nКој вид на пат е тоа?\nШтом ќе нацртате пат, треба да назначите што е. Дали е главна магистрала, пешачка патека или река? Како се вика? Има ли некои посебни правила (на пр. „забрането велосипеди“)?\n\nВо OpenStreetMap ова го запишувате со „ознаки“. Ознаката има два дела, и можете да користите колку што сакате ознаки. На пример, можете да додадете i>highway | trunk за да назначите дека ова е главен магистрален пат; highway | residential за пат во населба; or highway | footway за пешачка патека. If bikes were banned, you could then add bicycle | no. Потоа, за да го запишете името, додајте name | Партизански Одреди.\n\nОзнаките на Potlatch се појавуваат најдолу на екранот - кликнете на постоечка улица, и ќе видите каква ознака има. Кликете на знакот „+“ (најдолу-десно) за да додадете нова ознака. Секоја ознака има „x“ со што можете да ја избришете.\n\nМожете да означувате цели патишта; точки на патишта (можеби порта или семафори); и точки од интерес.\nКористење на зададени ознаки\nЗа да ви помогне да започнете, Potlatch ви нуди готови, најпопуларни ознаки.\n\nОдберете го патот, па кликајте низ симболите додека не најдете соодветен. Потоа изберете ја најсоодветната можност од менито.\n\nСо ова се пополнуваат ознаките. Некои ќе останат делумно празни за да можете да впишете (на пример) име на улицата и број\nЕднонасочни патишта\nВи препорачуваме да додадете ознака за еднонасочни улици како oneway | yes - но како да познаете во која насока? Најдолу-лево има стрелка која го означува правецот напатот, од почеток до крај. Кликнете на неа за да ја свртите обратно.\nИзбор на ваши сопствени ознаки\nСекако, не сте ограничени само на зададените ознаки. Користете го копчето „+“ за да користите какви што сакате ознаки.\n\nМожете да видите какви ознаки користат другите на OSMdoc, а имаме и долг список на популарни ознаки на нашето вики нареченаЕлементи. Но тие се само предлози, а не правила. Најслободно измислувајте си свои ознаки или преземајте од други корисници.\n\nБидејќи податоците од OpenStreetMap се користат за изработување на различни карти, секоја карта прикажува свој избор од ознаки.\nРелации\nПонекогаш не се доволни само ознаки, па ќе треба да „групирате“ два или повеќе пата. Можеби вртењето од една улица во друга е забрането, или пак 20 патеки заедно сочиннуваат означена велосипедска патека. Ова се прави во напредното мени „релации“. Дознајте повеќе на викито.\n\nВраќање грешки\nОва е копчето за враќање (може и со стискање на Z) - ова ќе го врати последното нешто кое сте го направиле.\n\nМожете да „вратите“ претходно зачувана верзија на еден пат или точка. Одберете ја, па кликнете на нејзината назнака. (бројот најдолу-лево) - или притиснете на H (за „историја“). Ќе видите список на која се наведува кој ја уредувал и кога. Одберете ја саканата верзија, и стиснете на „Врати“.\n\nДоколку сте избришале пат по грешка и сте зачувале, притиснете U (за да вратите). Ќе се појават сите избришани патишта. Одберете го саканиот пат; отклучете го со кликнување на катанчето; и зачувајте.\n\nМислите дека некој друг корисник направил грешка? Испратете му пријателска порака. Користете ја историјата (H) за да му го изберете името, па кликнете на „Пошта“\n\nКористете го Инспекторот (во менито „Напредно“) за корисни информации за моменталниот пат или точка.\nЧПП\nКако да ги видам моите патни точки?\nПатните точки се појавуваат само ако кликнете на „уреди“ до името на трагата во „GPS траги“. Податотеката мора да има и патни точки и запис на трагата - опслужувачот не пропушта податотеки кои имаат само патни точки.\n\nПовеќе ЧПП за Potlatch и OpenStreetMap.\n\n\n\nПобрзо работење\nШто повеќе оддалечувате, тоа повеќе податоци мора да вчита Potlatch. Приближете пред да стиснете на „Уреди“\n\nИсклучете го „Користи курсори „молив“ и „рака““ (во прозорецот за прилагодување) за да добиете максимална брзина.\n\nАко опслужувачот работи бавно, вратете се подоцна. Проверете го викито за да проверите познати проблеми. Некои термини како недела навечер се секогаш оптоварени.\n\nКажете му на Potlatch да ги запомни вашите омилени комплети со ознаки. Одберете пат или точка со тие ознаки, па притиснете на Ctrl, Shift и на број од 1 до 9. Потоа за повторно да ги користите тие ознаки, само притиснете Shift и тој број. (Ќе се паметат секојпат кога го користите Potlatch на овој сметач.)\n\nПретворете ја вашата GPS трага во пат со тоа што ќе ја пронајдете на списокот „GPS траги“ и ќе кликнете на „уреди“ до неа, а потоа на кутивчето „претвори“. Трагата ќе се заклучи (црвено), затоа не зачувувајте. Најпрвин уредете ја, па кликнете на катанчето (најдолу-десно) за да ја отклучите кога сте спремни да ја зачувате.\n\nШто да кликате\nВлечете ја картата за да се движите наоколу.\nДвоен клик за да направите нова точка од интерес (POI).\nКликнете еднап за да започнете нов пат.\nДржете и влечете пат или точка од интерес (POI) за да ги поместите.\nКога цртате пат\nДвоен клик или Enter за да завршите со цртање.\nКликнете на друг пат за да направите крстосница.\nShift-клик на крајот на друг пат за да споите.\nКога ќе изберете пат\nКликнете на точката за да ја одберете.\nShift-клик на патот за да вметнете нова точка.\nShift-клик на точка за оттаму да започнете нов пат.\nCtrl-клик на друг пат за спојување.\n\nТастатурни кратенки\nB Додај позадинска изворна ознака\nC Затвори измени\nG Прикажи GPS траги\nH Прикажи историја\nI Прикажи инспектор\nJ сврзи точка за вкрстени патишта\n(+Shift) Unjoin from other ways\nK Заклучи/отклучи го моментално избраното\nL Прикажи моментална географска должина\nM Зголеми уредувачки прозорец\nP Создај паралелен пат\nR Повтори ги ознаките\nS Зачувај (освен ако не е во живо)\nT Подреди во права линија/круг\nU Врати избришано (прикажи избришани патишра)\nX Пресечи пат на две\nZ Врати\n- Отстрани точка само од овој пат\n+ Додај нова ознака\n/ Избор на друг пат со истава точка\nDelete Избриши точка\n (+Shift) Избриши цел пат\nEnter Заврши со цртање на линијата\nSpace Држи и влечи позадина\nEsc Откажи го ова уредување; превчитај од опслужувачот \n0 Отстрани ги сите ознаки\n1-9 Избор на зададени ознаки\n (+Shift) Избери запамтени ознаки\n (+S/Ctrl) Запамти ознаки\n§ или ` Кружи помеѓу групи ознаки\n\n" - hint_drawmode: кликнете за да додадете точка,\nдвоен клик/Ентер\nза да ја завршите линијата - hint_latlon: "Г.Ш. $1\nГ.Д. $2" - hint_loading: вчитувам податоци - hint_overendpoint: врз крајна точка ($1)\nклик за врзување\nshift+клик за спојување - hint_overpoint: врз точка ($1)\nкликни за спојување - hint_pointselected: точката е избрана\n(shift+клик на точка за да\nпочнете нова линија) - hint_saving: ги зачувувам податоците - hint_saving_loading: вчитување/зачувување податоци - inspector: Инспектор - inspector_duplicate: Дупликат на - inspector_in_ways: Со патишта - inspector_latlon: "Г.Ш. $1\nГ.Д. $2" - inspector_locked: Заклучено - inspector_node_count: ($1 пати) - inspector_not_in_any_ways: Не е на ниеден пат (POI) - inspector_unsaved: Незачувано - inspector_uploading: (подигање) - inspector_way: $1 - inspector_way_connects_to: Се поврзува со $1 патишта - inspector_way_connects_to_principal: Се поврзува со $1 $2 и $3 други $4 - inspector_way_name: $1 ($2) - inspector_way_nodes: $1 јазли - inspector_way_nodes_closed: $1 јазли (затворено) - loading: Вчитувам... - login_pwd: "Лозинка:" - login_retry: Најавата не беше распознаена. Обидете се повторно. - login_title: Не можев да ве најавам - login_uid: "Корисничко име:" - mail: Пошта - microblog_name_identica: Identi.ca - microblog_name_twitter: Twitter - more: Повеќе - newchangeset: "Обидете се повторно: Potlatch ќе започне ново менување." - "no": Не - nobackground: Без позадина - norelations: Нема релации во постојната површина - offset_broadcanal: Ширококаналска влечна патека - offset_choose: Избери разлика - offset_dual: Двоен автопат (D2) - offset_motorway: Автопат - offset_narrowcanal: Тесноканалска влечна патека - ok: Ок - openchangeset: Отворам менување - option_custompointers: Користи курсори „молив“ и „рака“ - option_external: "Надворешно отворање:" - option_fadebackground: Побледи позадина - option_layer_cycle_map: OSM - велосипедска карта - option_layer_digitalglobe_haiti: "Хаити: DigitalGlobe" - option_layer_geoeye_gravitystorm_haiti: "Хаити: GeoEye 13 јануари" - option_layer_geoeye_nypl_haiti: "Хаити: GeoEye 13 јануари+" - option_layer_maplint: OSM - Maplint (грешки) - option_layer_mapnik: OSM - Mapnik - option_layer_nearmap: "Австралија: NearMap" - option_layer_ooc_25k: "Историски британски: 1:25k" - option_layer_ooc_7th: "Историски британски: 7-ми" - option_layer_ooc_npe: "Историски британски: NPE" - option_layer_ooc_scotland: "Историски британски: Шкотска" - option_layer_os_streetview: "Британија: OS StreetView" - option_layer_osmarender: OSM - Osmarender - option_layer_streets_haiti: "Хаити: имиња на улици" - option_layer_surrey_air_survey: "Велика Британија: Сариска воздушна геодезија" - option_layer_tip: Изберете позадина - option_layer_yahoo: Yahoo! - option_limitways: Предупреди ме кога се вчитува голем број на податоци - option_microblog_id: "Име на микроблогот:" - option_microblog_pwd: "Лозинка на микроблогот:" - option_noname: Означи неименувани улици - option_photo: "Фото KML:" - option_thinareas: Користи потенки линии за просторите - option_thinlines: Користи тенки линии за сите размери - option_tiger: Означи непроменет TIGER - option_warnings: Прикажи лебдечки предупредувања - point: Точка - preset_icon_airport: Аеродром - preset_icon_bar: Бар - preset_icon_bus_stop: Автобуска постојка - preset_icon_cafe: Кафуле - preset_icon_cinema: Кино - preset_icon_convenience: Продавница - preset_icon_disaster: Објект во Хаити - preset_icon_fast_food: Брза храна - preset_icon_ferry_terminal: Ферибот - preset_icon_fire_station: Пожарна - preset_icon_hospital: Болница - preset_icon_hotel: Хотел - preset_icon_museum: Музеј - preset_icon_parking: Паркинг - preset_icon_pharmacy: Аптека - preset_icon_place_of_worship: Верски објект - preset_icon_police: Полициска станица - preset_icon_post_box: Поштенско сандаче - preset_icon_pub: Пивница - preset_icon_recycling: Рециклирање - preset_icon_restaurant: Ресторан - preset_icon_school: Училиште - preset_icon_station: Железничка станица - preset_icon_supermarket: Супермаркет - preset_icon_taxi: Такси постојка - preset_icon_telephone: Телефон - preset_icon_theatre: Театар - preset_tip: Избери од мени со готови ознаки за $1 - prompt_addtorelation: Додајте $1 на оваа релација - prompt_changesetcomment: "Опишете ги вашите промени:" - prompt_closechangeset: Затвори измени $1 - prompt_createparallel: Создај паралелен пат - prompt_editlive: Уредување во живо - prompt_editsave: Уредување со зачувување - prompt_helpavailable: Дали сте нов корисник? Погледајте долу-лево за помош. - prompt_launch: Отвори надворешна URL адреса - prompt_live: Кога уредувате во живо, сето она што ќе го измените веднаш се зачувува во базата на OpenStreetMap - затоа не се препорачува на почетници. Дали сте сигурни? - prompt_manyways: Ова подрачје е многу детално и ќе му треба долго да се вчита. Дали би претпочитале да приближите? - prompt_microblog: Испрати на $1 (преостанува $2) - prompt_revertversion: "Врати претходна зачувана верзија:" - prompt_savechanges: Зачувај промени - prompt_taggedpoints: Некои точки на овој пат се означени. Навистина да ги избришам? - prompt_track: Претворете GPS траги во патишта - prompt_unlock: Кликнете за да отклучите - prompt_welcome: Добредојдовте на OpenStreetMap! - retry: Повторен обид - revert: Врати - save: Зачувај - tags_backtolist: Назад кон списокот - tags_descriptions: Описи на „$1“ - tags_findatag: Најди ознака - tags_findtag: Најди ознака - tags_matching: Популарни ознаки соодветни на „$1“ - tags_typesearchterm: "Внесете збор за пребарување:" - tip_addrelation: Додај во релација - tip_addtag: Додај нова ознака - tip_alert: Се појави грешка - кликнете за детали - tip_anticlockwise: Лево-ориентиран кружен пат - кликнете за обратно - tip_clockwise: Надесен кружен пат - кликнете за обратно - tip_direction: Правец - кликнете за обратно - tip_gps: Прикажи GPS-траги (G) - tip_noundo: Нема што да се врати - tip_options: Прилагодувања (изберете позадина за картата) - tip_photo: Вчитај слики - tip_presettype: Одберете тип функции за приказ во менито. - tip_repeattag: Повтори ги ознаките од претходно избран пат (R) - tip_revertversion: Одберете датум за враќање - tip_selectrelation: Додај кон избраната маршрута - tip_splitway: Оддели го патот во избраната точка (X) - tip_tidy: Среди ги точките на патот (T) - tip_undo: Врати $1 (Z) - uploading: Подигам... - uploading_deleting_pois: Бришење на точки од интерес (POI) - uploading_deleting_ways: Бришење патишта - uploading_poi: Ја подигам точката од интерес $1 - uploading_poi_name: Подигање на точката од интерес $1, $2 - uploading_relation: Подигање на релација $1 - uploading_relation_name: Подигање на релација $1, $2 - uploading_way: Подигање на патот $1 - uploading_way_name: Вчитувам пат $1, $2 - warning: Предупредување! - way: Пат - "yes": Да diff --git a/config/potlatch/locales/nl.yml b/config/potlatch/locales/nl.yml deleted file mode 100644 index 22f8d9038..000000000 --- a/config/potlatch/locales/nl.yml +++ /dev/null @@ -1,231 +0,0 @@ -# Messages for Dutch (Nederlands) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: McDutchie -# Author: Naudefj -# Author: Siebrand -nl: - a_poi: $1 een POI - a_way: Weg $1 - action_addpoint: Node toevoegen aan eind van de weg - action_cancelchanges: veranderingen ongedaan maken naar - action_changeway: wijzigingen aan een weg - action_createparallel: Parallelle wegen aanmaken - action_createpoi: Maak een POI (nuttige plaats) - action_deletepoint: Verwijder een punt - action_insertnode: Punt aan weg toevoegen - action_mergeways: twee wegen samenvoegen - action_movepoi: Verplaats de POI (nuttige plaats) - action_movepoint: Punt verplaatsen - action_moveway: Weg verplaatsen - action_pointtags: Labels op een punt instellen - action_poitags: Labels op een POI instellen - action_reverseway: Wegrichting omdraaien - action_revertway: Wijzigingen aan een weg ongedaan maken - action_splitway: Weg splitsen - action_waytags: Label op een weg instellen - advanced: Uitgebreid - advanced_close: Wijzigingenset sluiten - advanced_history: Weggeschiedenis - advanced_inspector: Detailvenster - advanced_maximise: Venster maximaliseren - advanced_minimise: Venster minimaliseren - advanced_parallel: Parallelle weg - advanced_tooltip: Gevorderde bewerkingen - advanced_undelete: Verwijdering ongedaan maken - advice_bendy: Er zijn te veel bochten om recht te maken (SHIFT om toch uit te voeren) - advice_conflict: Server conflict. Probeer opnieuw op te slaan - advice_deletingpoi: POI verwijderen (Z om ongedaan te maken) - advice_deletingway: Weg verwijderen (Z om ongedaan te maken) - advice_microblogged: Uw status bij $1 is bijgewerkt - advice_nocommonpoint: De wegen hebben geen gemeenschappelijk punt - advice_revertingpoi: Naar laatst opgeslagen POI aan het terugplaatsen (Z om ongedaan te maken) - advice_revertingway: Teruggaan naar de laatst opgeslagen weg (Z om ongedaan te maken) - advice_tagconflict: De labels komen niet overeen. Controleer uw invoer (Z om ongedaan te maken) - advice_toolong: Te lang om te unlocken - splits de weg in kortere stukken - advice_uploadempty: Er is niets te uploaden - advice_uploadfail: De upload is afgebroken - advice_uploadsuccess: Alle gegevens zijn geüpload - advice_waydragged: Weg verplaatst (Z om ongedaan te maken) - cancel: Annuleren - closechangeset: Wijzigingenset aan het sluiten - conflict_download: Bestaande versie downloaden - conflict_overwrite: Bestaande versie overschrijven - conflict_poichanged: In de tussentijd heeft iemand anders het punt $1$2 gewijzigd. - conflict_relchanged: Intussen heeft iemand anders de relatie $1$2 gewijzigd. - conflict_visitpoi: Klik 'OK' om het punt weer te geven. - conflict_visitway: Klik 'OK' om de weg weer te geven. - conflict_waychanged: Intussen heeft iemand anders de weg $1$2 gewijzigd. - createrelation: Nieuwe relatie maken - custom: "Aangepast:" - delete: Verwijderen - deleting: verwijder - drag_pois: Sleep POI's naar de kaart en zet ze neer - editinglive: Live bewerken - editingoffline: Offline bewerken - emailauthor: \n\nStuur alstublieft een e-mail naar richard\@systemeD.net waarin u beschrijft wat u aan het doen was. - error_anonymous: U kunt geen contact opnemen met een anonieme mapper. - error_connectionfailed: Sorry. De verbinding met de server is verbroken. Recente veranderingen zijn misschien niet opgeslagen.\n\nOpnieuw proberen? - error_microblog_long: "Het plaatsen van het bericht naar $1 is mislukt:\nHTTP-code: $2\nFoutbericht: $3\n$1-fout: $4" - error_nopoi: POI niet gevonden (hebt u de kaart weggeschoven?). Ongedaan maken is niet mogelijk. - error_nosharedpoint: De wegen $1 en $2 hebben geen gemeenschappelijk punt meer. De splitsing kan niet ongedaan gemaakt worden. - error_noway: De weg $1 kan niet gevonden worden (kaart weggeschoven?). Ongedaan maken is niet mogelijk. - error_readfailed: De server van OpenStreetMap gaf geen antwoord op het verzoek gegevens te leveren.\n\nWilt u het nog een keer proberen? - existingrelation: Toevoegen aan bestaande relatie - findrelation: Relatie zoeken met - gpxpleasewait: Even geduld alstublieft. De GPX-trace wordt verwerkt. - heading_drawing: Tekenen - heading_introduction: Inleiding - heading_pois: Beginnen - heading_quickref: Snelle hints - heading_surveying: Veldwerk - heading_tagging: Labelen - heading_troubleshooting: Problemen oplossen - help: Help - help_html: "Welkom bij Potlatch\nPotlatch is een eenvoudig te gebruiken bewerkingshulpmiddel voor OpenStreetMap. U kunt wegen, paden, kenmerken en winkels toevoegen aan uw GPS-tracks, satellietfoto's en oude kaarten.\n\nDeze hulppagina's beschrijven het basisgebruik van Potlatch en voorzien u van verwijzingen waar het gebruik dieper gaat dan de bedoeling is in deze inleiding. Klik op de hoofdstuktitels hierboven om te beginnen.\n\nAls u klaar bent, klik dan op een willekeurige plaats op de pagina buiten dit venster.\n\n\n\nBelangrijk om te weten\nKopieer niet van andere kaarten!\n\nAls u voor 'Live bewerken' kiest, worden alle wijzigingen die u maakt direct doorgevoerd in de database. Direct. Als u nog niet zo ervaren bent, kies dan voor 'Bewerken met opslaan' en dan worden de wijzigingen pas doorgevoerd als u op 'Opslaan' klikt.\n\nAlle bewerkingen die u maakt worden meestal na ongeveer twee uur op de kaart weergegeven. Sommige wijzigingen hebben een week nodig. Niet alles wordt op de kaart weergegeven. Dat zou de kaart onoverzichtelijk maken. Omdat de gegevens van OpenStreetMap open source zijn, staat het andere vrij om kaarten te maken die andere aspecten weergeven, zoals OpenCycleMap of Midnight Commander.\n\nBedenk u dat het zowel een kaart is die er goed uit moet zien (teken dus nette bochten) als een diagram (dus zorg ervoor dat wegen gekoppeld zijn bij kruisingen).\n\nWas er al verteld dat er niet van andere kaarten gekopieerd moest worden?\n\n\nMeer te weten komen\nHandleiding Potlatch\nMailinglijsten\nOnline chat (live hulp)\nWebforum\nGemeenschapswiki\nPotlatch-broncode\n\n\n\nBeginnen\nNu u Potlatch hebt geopend, klik \"Bewerken bij opslaan\" om te beginnen.\n\nNu bent u klaar om een kaart te tekenen. De meest eenvoudige manier om te beginnen is het plaatsen van een aantal interessant punten op de kaart. Deze heten ook wel \"POI's\". De kunnen café's, kerken, treinstations, of andere interessante plaatsen zijn.\n\nKlikken en slepen\nOm het heel erg eenvoudig te maken, ziet u rechtsonder aan de kaart een selectie van de meestgebruikte POI's. U kunt een POI op de kaart zetten door het te klikken en slepen naar de juiste plaats op de kaart. Het is niet belangrijk dat u het direct op exact de juiste plaats zet. U kunt het opnieuw aanklikken en verslepen tot u de juiste plaats hebt gevonden. Het POI licht geel op om aan te geven dat het is geselecteerd.\n\nAls u dat hebt gedaan, dan wilt u uw café (of kerk of treinstation) een naam geven. Er is een kleine tabel onderaan het venster verschenen. In een van de regels staat \"naam\" gevolgd door \"(type naam hier)\". Klik op de tekst en voer de naam in.\n\nKlik ergens anders op de kaart om uw POI te deselecteren en het kleurrijke kleine venstertje verschijnt weer.\n\nEenvoudig, niet waar? Klik op \"opslaan\" (rechtsonder) als u klaar bent.\nNavigeren\nOm naar een ander deel van de kaart te navigeren klikt u op een leeg deel van de kaart, waarna u deze kunt verslepen. Potlatch laadt dan automatisch de nieuwe gegevens. Zie ook de rechter bovenhoek.\n\nWe hebben u geadviseerd de optie \"Bewerken na opslaan\" te kiezen, maar u kunt ook voor \"Libe bewerken\" kiezen. Uw bewerkingen worden dan direct in de database doorgevoerd. Daarom is er geen knop \"Opslaan\". Deze invoermethode is geschikt voor het snel maken van wijzigingen en mapping parties.\n\nVolgende stappen\nGaat dat allemaal goed? Mooi zo! Klik op \"Veldwerk\" hierboven om uit te vinden hoe u een echte mapper kunt worden!\n\nVeldwerk met een GPS\nHet idee achter OpenStreetMap is een kaart te maken zonder de beperkte rechten van ander kaartmateriaal. Daarom kunt u niets overnemen van andere kaarten: u moet zelf de straat op om gegevens te verzamelen. Gelukkig is dat een plezierige bezigheid!\nDe beste manier om dit te doen is met een draagbare GPS. Zoek een geboed op dat nog niet in kaart is gebracht, en loop of fiets er dan doorheen terwijl uw GPS is ingeschakeld. Noteer de straatnamen en alle andere interessante dingen (cafés, kerken, enzovoort) terwijl u GPS-gegevens verzamelt.\n\nAls u thuis komt, bevat uw GPS een opgenomen \"tracklogboek\" waarin staat waar u bent geweest. U kunt dat dan uploaden naar OpenStreetMap.\n\nDe meest geschikte GPS is een GPS die het tracklogboek vaak bijwerkt (iedere paar seconden) en veel geheugen heeft. Veel mappers gebruiken de draagbare Garmin of kleine Bluetooth-apparaten. Er staan gedetailleerde beoordelingen van GPS-apparaten op de wiki.\n\nUw track uploaden\nDaarna moet uw GPS-track van het GPS-apparaat gehaald worden. Wellicht zat er software bij uw GPS, of misschien kunt u er bestanden van kopiëren via USB. Als dat niet mogelijk is, probeer het dan met GPSBabel. U wilt hoe dan ook dat het bestandsformaat GPX is.\n\nGebruik het tabblad \"GPS-tracks\" op de website van OpenStreetMap om uw track te uploaden. Maar dit is pas het eerste deel. Uw track verschijnt nog niet op de kaart. U moet zelf de wegen tekenen en benoemen, met de track als richtlijn.\nUw track gebruiken\nZoek uw track in de lijst \"GPS-tracks\" en klik op \"bewerken\" rechts naast de track. Dan start Potlatch en wordt deze track, samen met wegpunten geladen. Nu kunt u gaan tekenen!\n\nU kunt ook op deze knop klikken om de GPS-tracks van anderen te zien voor het huidige gebied (maar geen wegpunten). Houd SHIFT ingedrukt om alleen uw tracks weer te geven.\nSatellietfoto's gebruiken\nMaak u geen zorgen als u geen GPS-apparaat hebt. Van sommige steden zijn satellietfoto's beschikbaar gesteld (bedankt Yahoo!) die u na kunt tekenen. Ga op onderzoek uit, noteer de straatnamen en teken dan de lijnen in en voeg de labels toe.\n\nAls u geen satellietfoto's ziet, klik dan op de knop \"Instellingen\" en zorg dat \"Yahoo!\" is geselecteerd. Als u de satellietfoto's dan nog steeds niet ziet, zijn de opnamen voor uw gebied blijkbaar niet beschikbaar, of moet u wat uitzoomen.\n\nIn dezelfde knop treft u nog een aantal andere mogelijkheden aan, zoals een kaart van het Verenigd Koninkrijk waarvan de auteursrechten verlopen zijn, en OpenTopoMap voor de VS. Deze kaarten zijn allemaal geselecteerd omdat we ze mogen gebruiken. Kopieer niet van de kaarten van andere partijen of luchtfoto's. Auteursrechten zijn lastig!\n\nSommige satellietfoto's zijn verschoven ten opzichte van waar de wegen echt liggen. Als u hier achter komt, versleep de achtergrond dan terwijl u de SHIFT-toets ingedrukt houdt totdat weg en foto de juiste positie ten opzichte van elkaar hebben. Vertrouw GPS-tracks boven satellietfoto's.\n\nWegen tekenen\nOm een weg te tekenen, begint u op een vrije plaats op de kaart. Klik daar gewoon op. Klik daarna iedere keer voor een ander punt op de weg. Als u klaar bent, dubbelklik dan, op druk op Enter. Klik daarna ergens anders om de weg te deselecteren.\n\nOm een weg te tekenen die bij een andere weg begint, klikt u op de weg om deze te selecteren. De punten van de weg worden dan rood. Houd de SHIFT-toets ingedruk en klik op een punten om een nieuwe weg te tekenen vanaf dat punt. Als er geen rood punt staat bij de kruising, voeg dat dan toe met SHIFT+klik!\n\nKlik op \"Opslaan\" (rechtsonder) als u klaar bent. Sla vaak op, voor het geval er problemen zijn met de server.\n\nVerwacht niet dat uw wijzigingen direct te zien zijn op de hoofdkaart. Meestal duurt het minimaal twee uur, soms een week.\nVerbindingen maken\nTwee wegen moeten een punt (of \"node\") delen als ze bij elkaar komen. Zo weten routeplanners waar er afgeslagen moet worden.\n\nPotlatch regelt dit, mits u precies op de weg klikt waarmee u een verbinding wilt maken. Kijk naar de visuele hulpmiddelen: de punten lichten blauw op, de muiswijzer verandert, en als u klaar bent, is het koppelingspunt zwart omrand.\nVerplaatsen en verwijderen\nDit werkt precies zoals u het zou verwachten. Om een punt te verwijderen, selecteert u het, en drukt u op \"Delete\". Om een hele weg te verwijderen, typt u SHIFT+Delete.\n\nVersleep gewoon om te verplaatsen. Houd de selectieknop net iets langer ingedrukt voordat u een weg versleept. Dit is zo om ongelukjes te voorkomen.\nMeer gevorderd tekenen\nU moet een weg splitsen als twee delen van een weg verschillende namen hebben. Selecteer de weg en klik dan op het punt waar u wilt splitsen. Klik daarna op de schaar. Voeg twee wegen samen via CONTROL+klik, of de appeltoets op een Mac, maar voeg geen wegen samen met verschillende namen of van een verschillend type.\n\nRotondes tekenen is lastig. Potlatch helpt hierbij. Teken een ruwe cirkel en zorg dat deze met zichzelf is verbonden aan het einde. Klik daarna op dit icoon om de cirkel bij te werken. Met deze functie kunt u ook wegen recht maken.\nNoemenswaardige plaatsen\nHet eerste wat u hebt geleerd is het toevoegen van interessante punten. U kunt deze ook toevoegen door te dubbelklikken op de kaart. Er verschijnt dan een groene cirkel. Maar hoe dan aan te geven of het een café of een kerk is? Klik om dat uit te vinden op \"Labelen\" hierboven?\n\nWelk type weg is het?\nAls u een weg hebt getekend, moet u aangeven wat voor een weg het is. Is het een hoofdweg, een voetpad of een rivier? Hoe heet de weg? Zijn er speciale regels, als bijvoorbeeld geen fietsers?\n\nIn OpenStreetMap kunt u dit opnemen met \"labels\". Een label heeft twee onderdelen, en u kunt er zoveel gebruiken als u wilt. U kunt bijvoorbeeld highway | trunk toevoegen om aan te geven dat het een grote weg is, highway | residential voor een weg in een woonwijk, of highway | footway voor een voetpad. Als fietsen niet zijn toegestaan, kunt u bicycle | no toevoegen. Om de naam aan te geven, name | Kerkstraat.\n\nDe labels staan in Potlatch onderaan het scherm. Klik op een bestaande weg en dan ziet u welke labels deze weg heeft. Klik op \"+\" rechtsonder om een nieuw label toe te voegen. Door te klikken op \"x\" verwijdert u labels.\n\nU kunt hele wegen labelen, punten in de weg (zoals een poort of een verkeerslicht) en interessante punten.\nVooringestelde labels gebruiken\nOm u op weg te helpen, heeft Potlatch voorinstellingen met de meest populaire labels.\n\nSelecteer een weg en blader dan door de symbolen tot u een geschikt symbool vindt. Kies dan de van toepassing zijnde optie uit het menu.\n\nDan worden de labels ingevuld. Sommige labels blijven gedeeltelijk leeg, zodat u extra informatie kunt invoeren, zoals bijvoorbeeld de wegnaam en het nummer.\nEenrichtingswegen\nBij een weg met eenrichtingsverkeer wilt u het label oneway | yes toevoegen, maar hoe geeft u de richting aan? Linksonder staat een pijl die de richting aangeeft, van begin tot einde. Klik erop om de richting om te keren.\nUw eigen labels kiezen\nU hoeft zich natuurlijk niet te beperken tot de voorinstellingen. Door de knop \"+\" te gebruiken kunt u alle labels op alle objecten toepassen.\n\nU kunt de labels die andere gebruikers gebruiken op OSMdoc en er is een lange lijst met populaire tags beschikbaar op de wiki. Dit zijn echter suggesties, geen richtlijnen. Het staat u vrij om uw eigen labels toe te voegen en labels van anderen te gebruiken.\n\nOmdat de gegevens van OpenStreetMap worden gebruikt om verschillende kaarten te maken, wordt iedere kaart weergegeven (of \"gerenderd\") met zijn eigen selectie labels.\nRelaties\nSoms zijn labels niet voldoende, en wilt u meer wegen \"groeperen\". Wellicht mag u niet van de ene weg de andere inslaan, of zijn twintig wegen samen een fietsroute. U kunt dit aangegeven met de gevorderde functie \"relaties\". In de wiki staat hierover meer informatie.\n\nFouten ongedaan maken\nDit is de knop ongedaan maken. U kunt ook \"Z\" intypen. De laatst uitgevoerd handeling wordt dan ongedaan gemaakt.\n\nU kunt teruggaan naar een eerder opgeslagen versie van een weg of punt. Selecteer het object, en klik dan op het ID (het nummer linksonder), of klik \"H\" (voor geschiedenis). U krijgt dan een lijst te zien van iedereen die het object heeft bewerkt en wanneer. Kies dan \"Terugdraaien\".\n\nAls u per ongeluk een weg verwijderd hebt en de wijziging hebt opgeslagen, typ dan op \"U\" (ongedaan maken). Alle verwijderde wegen worden dan weergegeven. Kies de weg die u wilt terugplaatsen. Geef deze vrij door op het rode hangslot te klikken, en sla op.\n\nDenkt u dat iemand anders een fout heeft gemaakt? Stuur die gebruiker dan een vriendelijk bericht. Gebruik de optie \"Geschiedenis\" (H) om de naam van de gebruiker te selecteren en klik dan \"E-mailen\".\n\nGebruik de Inspector uit het menu \"Gevorderd\" voor informatie over de huidige weg of het huidige punt.\nFAQ's\nHoe kan ik mijn wegpunten zien?\nWegpunten worden alleen weergegeven als u op \"Bewerken\" klikt bij de tracknaam in \"GPS-tracks\". Het bestand moet zowel wegpunten bevatten als het logboek van de track. De server weigert alles dat alleen wegpunten bevat.\n\nMeer veelgestelde vragen voor Potlatch en OpenStreetMap.\n\n\n\nSneller werken\nHoe verder uw uitzoomt, hoe meer gegevens Potlatch moet laden. Zoom in voordat u op \"Bewerken\" klikt.\n\nSchakel \"Pen- en handaanwijzers gebruiken\" uit in het venster voor instellingen voor maximale snelheid.\n\nAls de server druk is, probeer het dan later nog een keer Kijk op de wiki of er bekende problemen zijn. Soms is het druk, bijvoorbeeld op zondagavond.\n\nStel uw favoriete sets met labels in in Potlatch. Selecteer een weg of punt met die labels. Type dan \"CTRL+SHIFT+een getal van 1 tot 9. Om daarna die labels opnieuw toe te passen, type u SHIFT+dat nummer. De sneltoetsen worden op de huidige computer voor de huidige gebruiker onthouden.\n\nMaak van uw GPS-track een weg door deze op te zoeken in de lijst \"GPS-tracks\". Klik op \"Bewerken\" en klik dan \"converteren\" aan. Deze gaat dan op slot (rood) zodat er niet wordt opgeslagen. Voer eerst uw bewerkingen uit en klik dan op het rode hangslot als u klaar bent om uw bewerkingen op te slaan.\n\nWat te klikken\nVersleep de kaart om te navigeren.\nDubbelklik om een nieuw POI toe te voegen.\nKlik om een nieuwe weg te beginnen.\nKlik en sleep een weg of POI om die te verplaatsen.\nTijdens het tekenen van een weg:\nDubbelklik of druk op Enter om het tekenen te beëindigen.\nKlik op een andere weg om een koppeling te maken.\nSHIFT+klik op het einde van een andere weg om samen te voegen.\nAls een weg is geselecteerd:\nKlik op een punt om het te selecteren.\nSHIFT+klik in de weg om een nieuw punt toe te voegen.\nSHIFT+klik op een punt om vanaf daar een nieuwe weg te beginnen.\nCONTROL+klik op een andere weg om samen te voegen.\n\nSneltoetsen\nB Bronlabel achtergrond toevoegen\nC Wijzigingenset sluiten\nG GPS-tracks weergeven\nH Geschiedenis weergeven\nI Inspector weergeven\nJ Punt met kruisende wegen samenvoegen\n(+Shift) Loskoppelen van andere wegen\nK Huidige selectie op slot zetten/vrijgeven\nL Huidige lengte/breedtegraag weergeven\nM Bewerkingsvenster maximaliseren\nP Parallelle weg aanmaken\nR Labels herhalen\nS Opslaan (tenzij Live bewerken wordt gebruikt)\nT Rechte lijn/cirkel maken\nU Terugdraaien (verwijderde wegen weergeven)\nX Weg in tweeën splitsen\nZ Ongedaan maken\n- Punt alleen uit deze weg verwijderen\n+ Nieuw label toevoegen\n/ Een andere weg die dit punt deelt selecteren\nDelete Punt verwijderen\n (+SHIFT) Hele weg verwijderen\nReturn Lijn tekenen afronden\nSpatie Vasthouden en achtergrond verplaatsen\nEsc Deze bewerking annuleren. Vanaf server herladen\n0 Alle labels verwijderen\n1-9 Vooringestelde labels selecteren\n (+Shift) Gememoriseerde labels selecteren\n (+S/Ctrl) Gememoriseerde label\n§ of ` Tussen labelgroepen wisselen\n\n" - hint_drawmode: Klik voor toevoegen nieuw punt\ndubbelklik/enter om\n de lijn te beëindigen - hint_latlon: "breedte $1\nlengte $2" - hint_loading: Wegen laden - hint_overendpoint: Eindpunt van een weg ($1)\nKlik om dit punt toe te voegen\nSHIFT+klik om beide wegen samen te voegen - hint_overpoint: Over punt ($1)\nKlik om dit punt toe te voegen - hint_pointselected: Het punt is geselecteerd\n(SHIFT+klik op het punt om\neen nieuwe lijn te beginnen) - hint_saving: gegevens opslaan - hint_saving_loading: gegevens laden en opslaan - inspector: Inspector - inspector_duplicate: Duplicaat van - inspector_in_ways: In wegen - inspector_latlon: "Breedte $1\nLengte $2" - inspector_locked: Op slot - inspector_node_count: ($1 keer) - inspector_not_in_any_ways: Niet in een weg (POI) - inspector_unsaved: Niet opgeslagen - inspector_uploading: (bezig met uploaden) - inspector_way_connects_to: Is verbonden met $1 wegen - inspector_way_connects_to_principal: Verbindt $1 $2 en $3 andere $4 - inspector_way_nodes: $1 nodes - inspector_way_nodes_closed: $1 nodes (gesloten) - loading: Bezig met laden... - login_pwd: "Wachtwoord:" - login_retry: Het aanmelden is mislukt. Probeer het nog een keer. - login_title: Het was niet mogelijk om aan te melden - login_uid: "Gebruiker:" - mail: E-mail - more: Meer - newchangeset: \nProbeer het opnieuw. Potlatch begint dan met een nieuwe wijzigingenset. - "no": Nee - nobackground: Geen achtergrond - norelations: Geen relaties in huidig gebied - offset_broadcanal: Breed kanaalsleeppad - offset_choose: Compensatie kiezen (m) - offset_dual: Dubbelbaans weg (D2) - offset_motorway: Autosnelweg (D3) - offset_narrowcanal: Sleeppad bij smal kanaal - ok: OK - openchangeset: Wijzigingenset wordt geopend - option_custompointers: Pen- en handcursors gebruiken - option_external: "Externe achtergrond:" - option_fadebackground: Achtergrond lichter maken - option_layer_cycle_map: OSM - fietskaart - option_layer_maplint: OSM - Maplint (fouten) - option_layer_nearmap: "Australië: NearMap" - option_layer_ooc_25k: "VK historisch: 1:25k" - option_layer_ooc_7th: "VK historisch: 7e" - option_layer_ooc_npe: "VK historisch: NPE" - option_layer_ooc_scotland: "VK historisch: Schotland" - option_layer_os_streetview: "VK: OS StreetView" - option_layer_streets_haiti: "Haïti: straatnamen" - option_layer_surrey_air_survey: "VK: Luchtonderzoek Surrey" - option_layer_tip: De achtergrondweergave kiezen - option_limitways: Waarschuwen als er veel gegevens geladen moeten worden - option_microblog_id: "Naam microblogdienst:" - option_microblog_pwd: "Wachtwoord voor microblogdienst:" - option_noname: Onbenoemde wegen uitlichten - option_photo: "KML bij foto:" - option_thinareas: Dunnere lijnen gebruiken voor gebieden - option_thinlines: Altijd dunne lijnen gebruiken - option_tiger: Ongewijzigde TIGER-gegevens uitlichten - option_warnings: Waarschuwingen bovenop kaart - point: Punt - preset_icon_airport: Luchthaven - preset_icon_bar: Café - preset_icon_bus_stop: Bushalte - preset_icon_cafe: Café - preset_icon_cinema: Bioscoop - preset_icon_convenience: Gemakswinkel - preset_icon_disaster: Gebouw op Haïti - preset_icon_fast_food: Fastfood - preset_icon_ferry_terminal: Veer - preset_icon_fire_station: Brandweerkazerne - preset_icon_hospital: Ziekenhuis - preset_icon_hotel: Hotel - preset_icon_museum: Museum - preset_icon_parking: Parkeerplaats - preset_icon_pharmacy: Apotheek - preset_icon_place_of_worship: Gebedsruimte - preset_icon_police: Politiebureau - preset_icon_post_box: Brievenbus - preset_icon_pub: Café - preset_icon_recycling: Recycling - preset_icon_restaurant: Restaurant - preset_icon_school: School - preset_icon_station: Treinstation - preset_icon_supermarket: Supermarkt - preset_icon_taxi: Taxistandplaats - preset_icon_telephone: Telefoon - preset_icon_theatre: Theater - preset_tip: Kies uit voorgeselecteerde labels die de $1 beschrijven - prompt_addtorelation: Voeg $1 toe aan een relatie - prompt_changesetcomment: "Geef hier een beschrijving van uw wijzigingen:" - prompt_closechangeset: Wijzigingenset $1 sluiten - prompt_createparallel: Parallelle weg aanmaken - prompt_editlive: Direct bewerken - prompt_editsave: Bewerken en opslaan - prompt_helpavailable: Nieuwe gebruiker? Kijk linksonder voor hulp. - prompt_launch: Externe URL als achtergrond - prompt_live: In live-modus worden al uw wijzigingen direct opgeslagen in de database van OpenStreetMap. Deze modus is niet voor beginners. Weet u het zeker? - prompt_manyways: Dit gebied is erg gedetailleerd en het duurt lang dat te laden. Wilt u inzoomen? - prompt_microblog: Op $1 plaatsen ($2 over) - prompt_revertversion: "Teruggaan naar een oudere versie:" - prompt_savechanges: Wijzigingen opslaan - prompt_taggedpoints: Sommige punten op deze weg hebben labels of relaties. Echt verwijderen? - prompt_track: GPS-tracks naar wegen converteren - prompt_unlock: Klik om vrij te geven - prompt_welcome: Welkom bij OpenStreetMap! - retry: Opnieuw proberen - revert: Terugdraaien - save: Opslaan - tags_backtolist: Terug naar de lijst - tags_descriptions: Beschrijvingen van "$1" - tags_findatag: Label zoeken - tags_findtag: Label zoeken - tags_matching: Populaire labels voor "$1" - tags_typesearchterm: "Zoeken naar:" - tip_addrelation: Voeg toe aan een relatie - tip_addtag: Nieuw label toevoegen - tip_alert: Foutmelding - Klik voor meer details - tip_anticlockwise: Tegen de klok in draaiende weg. Klik om om te draaien - tip_clockwise: Met de klok mee draaiende weg. Klik om om te draaien - tip_direction: Richting van de weg. Klik om de richting om te draaien - tip_gps: GPS-tracks weergeven (G) - tip_noundo: Niets ongedaan te maken - tip_options: Opties (kies de achtergrondkaart) - tip_photo: Afbeeldingen laden - tip_presettype: Kies welke typen voorkeuren in het menu worden weergegeven. - tip_repeattag: Labels van de vorige geselecteerde weg herhalen (R) - tip_revertversion: Kies naar welke versie terug te gaan - tip_selectrelation: Toevoegen aan gekozen route - tip_splitway: Weg op het geselecteerde punt splitsen (X) - tip_tidy: Punten in weg opschonen (T) - tip_undo: $1 ongedaan maken (Z) - uploading: Bezig met uploaden... - uploading_deleting_pois: Bezig met het verwijderen van POI's - uploading_deleting_ways: Bezig met wegen verwijderen - uploading_poi: Bezig met het uploaden van POI $1 - uploading_poi_name: Bezig met het uploaden van POI $1, $2 - uploading_relation: Bezig met het bijwerken van de relatie $1 - uploading_relation_name: Bezig met het uploaden van relatie $1, $2 - uploading_way: Bezig met het uploaden van weg $1 - uploading_way_name: Bezig met uploaden van weg $1, $2 - warning: Waarschuwing! - way: Weg - "yes": Ja diff --git a/config/potlatch/locales/nn.yml b/config/potlatch/locales/nn.yml deleted file mode 100644 index 6d5201d46..000000000 --- a/config/potlatch/locales/nn.yml +++ /dev/null @@ -1,99 +0,0 @@ -# Messages for Norwegian Nynorsk (‪Norsk (nynorsk)‬) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Gnonthgol -nn: - action_addpoint: leggjer til ein node på enden av ein veg - action_cancelchanges: avbryt endringar på - action_changeway: endringar for ein veg - action_createparallel: lagar paralelle vegar - action_deletepoint: slettar eit punkt - action_insertnode: leggjer til ein node på ein veg - action_mergeways: slår saman to vegar - action_movepoint: flyttar eit punkt - action_moveway: flyttar eit veg - action_pointtags: setjer merker på eit punkt - action_reverseway: snur om ein veg - action_revertway: tilbakestiller ein veg - action_splitway: deler ein veg - action_waytags: setjer merker på ein veg - advanced: Avansert - advanced_close: Lukk endringssett - advanced_history: Historien til vegen - advanced_inspector: Inspektør - advanced_maximise: Maksimer vindauge - advanced_minimise: Minimer vindauge - advanced_parallel: Parallell veg - advanced_tooltip: Avanserte redigeringshandlingar - advanced_undelete: Gjenopprett - advice_bendy: For bøygd for å rette opp (SHIFT for å tvinge) - advice_conflict: Tjenerkonflikt - du må kansje prøve å lagre igjen - advice_deletingway: Slettar veg (Z for å angre) - advice_microblogged: Oppdaterte din $1 status - advice_nocommonpoint: Vegane deler ikkje eit felles punkt - advice_revertingway: Tilbakestiller til sist lagra veg (Z for å angre) - advice_tagconflict: Ulike merkjer - vennligst sjekk (Z for å angre) - advice_toolong: For lang til å låse opp - ver god å del vegen i kortare bitar - advice_uploadempty: Ingenting å laste opp - advice_uploadfail: Opplasting stoppa - advice_uploadsuccess: Alle data vart vellukka lasta opp - advice_waydragged: Veg flytta (Z for å angre) - cancel: Avbryt - closechangeset: Lukkar endringsett - conflict_download: Last ned deira versjon - conflict_overwrite: Overskriv deira versjon - conflict_poichanged: Etter at du starta redigeringa har nokon andre endra punkt $1$2 - conflict_relchanged: Etter at du starta redigeringa har nokon andre endra relasjonen $1$2 - conflict_visitpoi: Klikk 'OK' for å vise punktet. - conflict_visitway: Klikk 'OK' for å vise vegen. - conflict_waychanged: Etter at du starta redigeringa har nokon andre endra vegen $1$2 - createrelation: Lag ein ny relasjon - custom: "Eigendefinert:" - delete: Slett - deleting: slettar - drag_pois: Dra og slipp interessepunkt - editinglive: Redigerer direkte - editingoffline: Redigerer frakobla - emailauthor: \n\nVer god å send e-post på engelsk til richard@systemeD.net med ein feilrapport som forklarer kva du gjorde når det skjedde. - error_anonymous: Du kan ikkje kontakte ein anonym kartleggjar. - error_connectionfailed: Beklagar - forbindelsen til OpenStreetMap tjenaren svikta. Nyare endringar treng ikkje ha blitt lagra. \n\nVil du prøve igjen? - error_microblog_long: "Posting til $1 svikta:\nHTTP kode: $2\nFeilmelding: $3\n$1 feil: $4" - error_nosharedpoint: Vegane $1 og $2 deler ingen felles punkt lenger så det er ikkje mulig å gjere om delinga. - error_noway: Veg $1 er ikkje å finne så det er ikkje mulig å gjere om. (Kansje den ikkje er på skjermen lengre?) - error_readfailed: Årsak - OpenStreetMap tjenaren svarte ikkje når den blei spurt etter data. \n\nVil du prøve igjen? - existingrelation: Legg til i ein eksisterande relasjon - findrelation: Finn ein relasjon som inneheld - gpxpleasewait: Ver god og vent mens GPX sporet blir behandla - heading_drawing: Teiknar - heading_introduction: Introduksjon - heading_pois: Komma i gang - heading_quickref: Rask referanse - heading_surveying: Utforsking - heading_tagging: Merking - heading_troubleshooting: Feilsøking - help: Hjelp - hint_drawmode: trykk for å legge til punkt\ndobbeltklikk eller enter\nfor å avslutte linje - hint_latlon: "bre $1\nlen $2" - hint_loading: lastar data - hint_overendpoint: over endepunkt ($1)\nklikk for å binde saman\nshift-klikk for å slå saman - hint_overpoint: over punkt ($1)\nklikk for å binde saman - hint_pointselected: punkt valt\n(shift-trykk punktet for å\nstarte ei ny linje) - hint_saving: lagrar data - hint_saving_loading: lastar/lagrar data - inspector: Inspektør - inspector_duplicate: Duplikat av - inspector_in_ways: På vegar - inspector_latlon: "Bre $1\nLen $2" - inspector_locked: Låst - inspector_node_count: ($1 gonger) - inspector_unsaved: Ulagra - inspector_way_nodes: $1 nodar - inspector_way_nodes_closed: $1 nodar (lukka) - loading: Lastar... - login_pwd: "Passord:" - login_uid: "Brukarnamn:" - mail: Post - more: Meir - "no": Nei - ok: OK - point: Punkt diff --git a/config/potlatch/locales/no.yml b/config/potlatch/locales/no.yml deleted file mode 100644 index 205a4f444..000000000 --- a/config/potlatch/locales/no.yml +++ /dev/null @@ -1,231 +0,0 @@ -# Messages for Norwegian (bokmål)‬ (‪Norsk (bokmål)‬) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Hansfn -# Author: Laaknor -# Author: Nghtwlkr -"no": - a_poi: $1 et POI - a_way: $1 en linje - action_addpoint: legger til et punkt på enden av en linje - action_cancelchanges: avbryter endringer av - action_changeway: endringer for ei linje - action_createparallel: lager parallelle veier - action_createpoi: lage et POI (interessant punkt) - action_deletepoint: sletter et punkt - action_insertnode: legge til et punkt på linjen - action_mergeways: slår sammen to linjer - action_movepoi: flytter et POI (interessant punkt) - action_movepoint: flytter punkt - action_moveway: flytter en linje - action_pointtags: sette merker på et punkt - action_poitags: sette merker på et POI (interessant punkt) - action_reverseway: snur en linje bak fram - action_revertway: endrer retning på en vei - action_splitway: dele en linje - action_waytags: sette merker på en linje - advanced: Avansert - advanced_close: Lukk endringssett - advanced_history: Linjens historie - advanced_inspector: Inspektør - advanced_maximise: Maksimer vindu - advanced_minimise: Minimer vindu - advanced_parallel: Parallell vei - advanced_tooltip: Avanserte redigeringshandlinger - advanced_undelete: Ikke slett - advice_bendy: For bøyd til å rette ut (SHIFT for å tvinge) - advice_conflict: Tjenerkonflikt - du må kanskje prøve å lagre igjen - advice_deletingpoi: Sletter POI (Z for å angre) - advice_deletingway: Sletter vei (Z for å angre) - advice_microblogged: Oppdaterte din $1 status - advice_nocommonpoint: Linjene deler ikke et felles punkt - advice_revertingpoi: Tilbakestiller til sist lagrede POI (Z for å angre) \ - advice_revertingway: Tilbakestiller til sist lagrede vei (Z for å angre) \ - advice_tagconflict: Ulike merker, vennligst sjekk (Z for å angre) - advice_toolong: For lang til å låse opp, linjen må deles i flere biter - advice_uploadempty: Ingenting å laste opp - advice_uploadfail: Opplasting stoppet - advice_uploadsuccess: Alle data ble lastet opp - advice_waydragged: Linje flyttet (Z for å angre) - cancel: Avbryt - closechangeset: Lukker endringssett - conflict_download: Last ned deres versjon - conflict_overwrite: Overskriv deres versjon - conflict_poichanged: Etter at du startet redigeringen har noen andre endret punkt $1$2. - conflict_relchanged: Etter at du startet redigeringen har noen andre endret relasjonen $1$2. - conflict_visitpoi: Klikk 'OK' for å visepunkt. - conflict_visitway: Klikk 'Ok' for å vise linjen. - conflict_waychanged: Etter at du startet å redigere har noen andre endret $1$2. - createrelation: Lag en ny relasjon - custom: "Egendefinert:" - delete: Slett - deleting: sletter - drag_pois: Dra og slipp interessepunkt - editinglive: Redigerer live - editingoffline: Redigering frakobla - emailauthor: \n\nVennligst send en epost (på engelsk) til richard\@systemeD.net med en feilrapport, og forklar hva du gjorde når det skjedde. - error_anonymous: Du kan ikke kontakte en anonym kartbruker. - error_connectionfailed: "Beklager - forbindelsen til OpenStreetMap-tjeneren feilet, eventuelle nye endringer har ikke blitt lagret.\n\nVil du prøve på nytt?" - error_microblog_long: "Posting til $1 feilet:\nHTTP-kode: $2\nFeilmelding: $3\n$1-feil: $4" - error_nopoi: Fant ikke POI-et, så det er ikke mulig å angre. (Kanskje den ikke er på skjermen lenger?) - error_nosharedpoint: Linjene $1 og $2 deler ikke noe punkt lenger, så det er ikke mulig å angre. - error_noway: Fant ikke linjen $1 så det er ikke mulig å angre. (Kanskje den ikke er på skjermen lenger?) - error_readfailed: Beklager - OpenStreetMap-serveren svarte ikke når den ble spurt om data. \n\nVil du forsøke igjen? - existingrelation: Legg til en relasjon som er her fra før - findrelation: Finn en relasjon som inneholder - gpxpleasewait: Vennligst vent mens sporloggen behandles. - heading_drawing: Tegner - heading_introduction: Introduksjon - heading_pois: Komme igang - heading_quickref: Rask referanse - heading_surveying: Kartlegging - heading_tagging: Merking - heading_troubleshooting: Feilsøking - help: Hjelp - help_html: "Velkommen til Potlatch\nPotlatch er et enkelt verktøy for OpenStreetMap-redigering. Tegn veier, stier, landsmerker og butikker fra din GPS-kartlegging, satelittbilder eller gamle kart.\n\nDisse hjelpesidene vil hjelpe deg igjennom de grunnlegende funksjonene i Potlatch, og fortelle deg hvor du kan finne ut mer. Klikk på overskriftene over for å begynne.\n\nNår du er ferdig er det bare å trykke et annet sted på denne siden.\n\n\n\nKjekt å vite\nIkke kopier fra andre kart!\n\nHvis du bruker 'Rediger direkte', alle endringer du gjør vil gå rett inn i databasen etterhvert som du tegner dem. Hvis du ikke er så selvsikker på endringene dine, velg 'Rediger med lagring', og endringene vil gå inn når du trykker på 'Lagre'.\n\nAny edits you make will usually be shown on the map after an hour or two (a few things take a week). Not everything is shown on the map - it would look too messy. But because OpenStreetMap's data is open source, other people are free to make maps showing different aspects - like OpenCycleMap or Midnight Commander.\n\nhusk at det er både et pent kart (så lag fine svinger på veien) og et diagram (så sørg for at veiene møtes i kryss).\n\nNevnte vi at du ikke skal kopiere fra andre kart?\n\n\nFinn ut mer\nPotlatchs manual\nEpostlister\nChat (direktehjelp)\nWeb-forum\nFellesskapswiki\nPotlatchs kildekode\n\n\n\nGetting started\nNå som du har åpnet Potlatch, trykk på 'Rediger med lagring' for å begynne.\n\nSo you're ready to draw a map. The easiest place to start is by putting some points of interest on the map - or \"POIs\". These might be pubs, churches, railway stations... anything you like.\n\nDra og slipp\nTo make it super-easy, you'll see a selection of the most common POIs, right at the bottom of the map for you. Putting one on the map is as easy as dragging it from there onto the right place on the map. And don't worry if you don't get the position right first time: you can drag it again until it's right. Note that the POI is highlighted in yellow to show that it's selected.\n\nOnce you've done that, you'll want to give your pub (or church, or station) a name. You'll see that a little table has appeared at the bottom. One of the entries will say \"name\" followed by \"(type name here)\". Do that - click that text, and type the name.\n\nClick somewhere else on the map to deselect your POI, and the colourful little panel returns.\n\nLett, er det ikke? Klikk på 'Lagre' (nede til høyre) når du er ferdig.\nFlytte rundt\nFor å flytte til en annen del av kartet, bare klikk på et tomt område i kartet og dra. Potlatch vil automatisk laste de nye dataene for det nye området (se øverst til høyre).\n\nWe told you to 'Edit with save', but you can also click 'Edit live'. If you do this, your changes will go into the database straightaway, so there's no 'Save' button. This is good for quick changes and mapping parties.\n\nNeste skritt\nHappy with all of that? Great. Click 'Surveying' above to find out how to become a real mapper!\n\nKartlegging med en GPS\nThe idea behind OpenStreetMap is to make a map without the restrictive copyright of other maps. This means you can't copy from elsewhere: you must go and survey the streets yourself. Fortunately, it's lots of fun!\nThe best way to do this is with a handheld GPS set. Find an area that isn't mapped yet, then walk or cycle up the streets with your GPS switched on. Note the street names, and anything else interesting (pubs? churches?) , as you go along.\n\nWhen you get home, your GPS will contain a 'tracklog' recording everywhere you've been. You can then upload this to OpenStreetMap.\n\nThe best type of GPS is one that records to the tracklog frequently (every second or two) and has a big memory. Lots of our mappers use handheld Garmins or little Bluetooth units. There are detailed GPS Reviews on our wiki.\n\nUploading your track\nNow, you need to get your track off the GPS set. Maybe your GPS came with some software, or maybe it lets you copy the files off via USB. If not, try GPSBabel. Whatever, you want the file to be in GPX format.\n\nThen use the 'GPS Traces' tab to upload your track to OpenStreetMap. But this is only the first bit - it won't appear on the map yet. You must draw and name the roads yourself, using the track as a guide.\nUsing your track\nFind your uploaded track in the 'GPS Traces' listing, and click 'edit' right next to it. Potlatch will start with this track loaded, plus any waypoints. You're ready to draw!\n\nYou can also click this button to show everyone's GPS tracks (but not waypoints) for the current area. Hold Shift to show just your tracks.\nBruk av satelittbilder\nIf you don't have a GPS, don't worry. In some cities, we have satellite photos you can trace over, kindly supplied by Yahoo! (thanks!). Go out and note the street names, then come back and trace over the lines.\n\nIf you don't see the satellite imagery, click the options button and make sure 'Yahoo!' is selected. If you still don't see it, it's probably not available for your city, or you might need to zoom out a bit.\n\nOn this same options button you'll find a few other choices like an out-of-copyright map of the UK, and OpenTopoMap for the US. These are all specially selected because we're allowed to use them - don't copy from anyone else's maps or aerial photos. (Copyright law sucks.)\n\nSometimes satellite pics are a bit displaced from where the roads really are. If you find this, hold Space and drag the background until it lines up. Always trust GPS tracks over satellite pics.\n\nDrawing ways\nTo draw a road (or 'way') starting at a blank space on the map, just click there; then at each point on the road in turn. When you've finished, double-click or press Enter - then click somewhere else to deselect the road.\n\nTo draw a way starting from another way, click that road to select it; its points will appear red. Hold Shift and click one of them to start a new way at that point. (If there's no red point at the junction, shift-click where you want one!)\n\nClick 'Save' (bottom right) when you're done. Save often, in case the server has problems.\n\nDon't expect your changes to show instantly on the main map. It usually takes an hour or two, sometimes up to a week.\nMaking junctions\nIt's really important that, where two roads join, they share a point (or 'node'). Route-planners use this to know where to turn.\n\nPotlatch takes care of this as long as you are careful to click exactly on the way you're joining. Look for the helpful signs: the points light up blue, the pointer changes, and when you're done, the junction point has a black outline.\nMoving and deleting\nThis works just as you'd expect it to. To delete a point, select it and press Delete. To delete a whole way, press Shift-Delete.\n\nTo move something, just drag it. (You'll have to click and hold for a short while before dragging a way, so you don't do it by accident.)\nMore advanced drawing\nIf two parts of a way have different names, you'll need to split them. Click the way; then click the point where it should be split, and click the scissors. (You can merge ways by clicking with Control, or the Apple key on a Mac, but don't merge two roads of different names or types.)\n\nRoundabouts are really hard to draw right. Don't worry - Potlatch can help. Just draw the loop roughly, making sure it joins back on itself at the end, then click this icon to 'tidy' it. (You can also use this to straighten out roads.)\nPoints of interest\nThe first thing you learned was how to drag-and-drop a point of interest. You can also create one by double-clicking on the map: a green circle appears. But how to say whether it's a pub, a church or what? Click 'Tagging' above to find out!\n\nWhat type of road is it?\nOnce you've drawn a way, you should say what it is. Is it a major road, a footpath or a river? What's its name? Are there any special rules (e.g. \"no bicycles\")?\n\nIn OpenStreetMap, you record this using 'tags'. A tag has two parts, and you can have as many as you like. For example, you could add highway | trunk to say it's a major road; highway | residential for a road on a housing estate; or highway | footway for a footpath. If bikes were banned, you could then add bicycle | no. Then to record its name, add name | Market Street.\n\nThe tags in Potlatch appear at the bottom of the screen - click an existing road, and you'll see what tags it has. Click the '+' sign (bottom right) to add a new tag. The 'x' by each tag deletes it.\n\nYou can tag whole ways; points in ways (maybe a gate or a traffic light); and points of interest.\nUsing preset tags\nTo get you started, Potlatch has ready-made presets containing the most popular tags.\n\nSelect a way, then click through the symbols until you find a suitable one. Then, choose the most appropriate option from the menu.\n\nThis will fill the tags in. Some will be left partly blank so you can type in (for example) the road name and number.\nOne-way roads\nYou might want to add a tag like oneway | yes - but how do you say which direction? There's an arrow in the bottom left that shows the way's direction, from start to end. Click it to reverse.\nChoosing your own tags\nOf course, you're not restricted to just the presets. By using the '+' button, you can use any tags at all.\n\nYou can see what tags other people use at OSMdoc, and there is a long list of popular tags on our wiki called Map Features. But these are only suggestions, not rules. You are free to invent your own tags or borrow from others.\n\nBecause OpenStreetMap data is used to make many different maps, each map will show (or 'render') its own choice of tags.\nRelations\nSometimes tags aren't enough, and you need to 'group' two or more ways. Maybe a turn is banned from one road into another, or 20 ways together make up a signed cycle route. You can do this with an advanced feature called 'relations'. Find out more on the wiki.\n\nUndoing mistakes\nThis is the undo button (you can also press Z) - it will undo the last thing you did.\n\nYou can 'revert' to a previously saved version of a way or point. Select it, then click its ID (the number at the bottom left) - or press H (for 'history'). You'll see a list of everyone who's edited it, and when. Choose the one to go back to, and click Revert.\n\nIf you've accidentally deleted a way and saved it, press U (for 'undelete'). All the deleted ways will be shown. Choose the one you want; unlock it by clicking the red padlock; and save as usual.\n\nThink someone else has made a mistake? Send them a friendly message. Use the history option (H) to select their name, then click 'Mail'.\n\nUse the Inspector (in the 'Advanced' menu) for helpful information about the current way or point.\nFAQs\nHow do I see my waypoints?\nWaypoints only show up if you click 'edit' by the track name in 'GPS Traces'. The file has to have both waypoints and tracklog in it - the server rejects anything with waypoints alone.\n\nMore FAQs for Potlatch and OpenStreetMap.\n\n\n\nWorking faster\nThe further out you're zoomed, the more data Potlatch has to load. Zoom in before clicking 'Edit'.\n\nTurn off 'Use pen and hand pointers' (in the options window) for maximum speed.\n\nIf the server is running slowly, come back later. Check the wiki for known problems. Some times, like Sunday evenings, are always busy.\n\nTell Potlatch to memorise your favourite sets of tags. Select a way or point with those tags, then press Ctrl, Shift and a number from 1 to 9. Then, to apply those tags again, just press Shift and that number. (They'll be remembered every time you use Potlatch on this computer.)\n\nTurn your GPS track into a way by finding it in the 'GPS Traces' list, clicking 'edit' by it, then tick the 'convert' box. It'll be locked (red) so won't save. Edit it first, then click the red padlock to unlock when ready to save.\n\nWhat to click\nDrag the map to move around.\nDouble-click to create a new POI.\nSingle-click to start a new way.\nHold and drag a way or POI to move it.\nWhen drawing a way\nDouble-click or press Enter to finish drawing.\nClick another way to make a junction.\nShift-click the end of another way to merge.\nWhen a way is selected\nClick a point to select it.\nShift-click in the way to insert a new point.\nShift-click a point to start a new way from there.\nControl-click another way to merge.\n\nKeyboard shortcuts\nB Add background source tag\nC Close changeset\nG Show GPS tracks\nH Show history\nI Show inspector\nJ Join point to what's below ways\n(+Shift) Unjoin from other ways\nK Lock/unlock current selection\nL Show current latitude/longitude\nM Maximise editing window\nP Create parallel way\nR Repeat tags\nS Save (unless editing live)\nT Tidy into straight line/circle\nU Undelete (show deleted ways)\nX Cut way in two\nZ Undo\n- Remove point from this way only\n+ Add new tag\n/ Select another way sharing this point\nDelete Delete point\n (+Shift) Delete entire way\nReturn Finish drawing line\nSpace Hold and drag background\nEsc Abort this edit; reload from server\n0 Remove all tags\n1-9 Select preset tags\n (+Shift) Select memorised tags\n (+S/Ctrl) Memorise tags\n§ or ` Cycle between tag groups\n\n" - hint_drawmode: trykk for å legge til punkt\ndobbeltklikk eller enter\nfor å avslutte linje - hint_latlon: "bre $1\nlen $2" - hint_loading: laster linjer - hint_overendpoint: over endepunkt\ntrykk for å koble sammen\nshift+trykk for å slå sammen - hint_overpoint: over punkt ($1)\nklikk for å koble sammen - hint_pointselected: punkt valgt\n(shift+trykk punktet for å\nstarte en ny linje) - hint_saving: lagrer data - hint_saving_loading: laster/lagrer data - inspector: Inspektør - inspector_duplicate: Duplikat av - inspector_in_ways: På måter - inspector_latlon: "Bre $1\nLen $2\n\\" - inspector_locked: Låst - inspector_node_count: ($1 ganger) - inspector_not_in_any_ways: Ikke på noen måter (POI) - inspector_unsaved: Ulagret - inspector_uploading: (laster opp) - inspector_way_connects_to: Kobler til $1 veier - inspector_way_connects_to_principal: Kobler til $1 $2 og $3 andre $4 - inspector_way_nodes: $1 noder - inspector_way_nodes_closed: $1 noder (lukket) - loading: Laster... - login_pwd: "Passord:" - login_retry: Ditt logginn ble ikke gjenkjent. Vennligst prøv igjen. - login_title: Kunne ikke logge inn - login_uid: "Brukernavn:" - mail: Post - more: Mer - newchangeset: "\nPrøv igjen: Potlatch vil starte et nytt endringssett." - "no": Nei - nobackground: Ingen bakgrunn - norelations: Ingen relasjoner i området på skjermen - offset_broadcanal: Bred tauningssti langs kanal - offset_choose: Endre forskyving (m) - offset_dual: Firefelts motorvei (D2) - offset_motorway: Motorvei (D3) - offset_narrowcanal: Smal tauningssti langs kanal - ok: Ok - openchangeset: Åpner endringssett - option_custompointers: Bruk penn- og håndpekere - option_external: "Starte eksternt:" - option_fadebackground: Fjern bakgrunn - option_layer_cycle_map: OSM - sykkelkart - option_layer_maplint: OSM - Maplint (feil) - option_layer_nearmap: "Australia: NearMap" - option_layer_ooc_25k: "Historiske UK kart: 1:25k" - option_layer_ooc_7th: "UK historisk: 7de" - option_layer_ooc_npe: "UK historisk: NPE" - option_layer_ooc_scotland: "UK historisk: Skottland" - option_layer_os_streetview: "UK: OS StreetView" - option_layer_streets_haiti: "Haiti: gatenavn" - option_layer_surrey_air_survey: "UK: Surrey Air Survey" - option_layer_tip: Velg bakgrunnen som skal vises - option_limitways: Advar når mye data lastes - option_microblog_id: "Mikroblogg brukernavn:" - option_microblog_pwd: "Mikroblog passord:" - option_noname: Uthev veier uten navn - option_photo: "Bilde KML:" - option_thinareas: Bruk tynnere linjer for områder - option_thinlines: Bruk tynne linjer uansett forstørrelse - option_tiger: Marker uendret TIGER - option_warnings: Vis flytende advarsler - point: Punkt - preset_icon_airport: Flyplass - preset_icon_bar: Bar - preset_icon_bus_stop: Busstopp - preset_icon_cafe: Kafé - preset_icon_cinema: Kino - preset_icon_convenience: Nærbutikk - preset_icon_disaster: Bygning i Haiti - preset_icon_fast_food: Fastfood - preset_icon_ferry_terminal: Ferge - preset_icon_fire_station: Brannstasjon - preset_icon_hospital: Sykehus - preset_icon_hotel: Hotell - preset_icon_museum: Museum - preset_icon_parking: Parkering - preset_icon_pharmacy: Apotek - preset_icon_place_of_worship: Religiøst sted - preset_icon_police: Politistasjon - preset_icon_post_box: Postboks - preset_icon_pub: Pub - preset_icon_recycling: Resirkulering - preset_icon_restaurant: Restaurant - preset_icon_school: Skole - preset_icon_station: Jernbanestasjon - preset_icon_supermarket: Supermarked - preset_icon_taxi: Drosjeholdeplass - preset_icon_telephone: Telefon - preset_icon_theatre: Teater - preset_tip: Velg fra en meny med forhåndsdefinerte merkelapper som beskriver $1 - prompt_addtorelation: Legg $1 til en relasjon - prompt_changesetcomment: "Legg inn en beskrivelse av dine endringer:" - prompt_closechangeset: Lukk endringssett $1 - prompt_createparallel: Lag parallell linje - prompt_editlive: Rediger live - prompt_editsave: Redigering med lagring - prompt_helpavailable: Ny bruker? Se nederst til venstre for hjelp. - prompt_launch: Kjør ekstern URL - prompt_live: I direkte-modus kommer alle endringer du gjør til å bli lagret på OpenStreetMaps database med en gang - det er ikke anbefalt for nybegynnere. Er du sikker? - prompt_manyways: Dette området er svært detaljert og vil ta lang tid å laste. Vil du zoome inn? - prompt_microblog: Post til $1 ($2 igjen) - prompt_revertversion: "Tilbakestill til tidligere lagret versjon:" - prompt_savechanges: Lagre endringer - prompt_taggedpoints: Noen av punktene på denne veien har merker eller er med i relasjoner. Vil du virkelig slette? - prompt_track: Overfør dine GPS-sporinger til (låste) linjer for redigering. - prompt_unlock: Klikk for å låse opp - prompt_welcome: Velkommen til OpenStreetMap! - retry: Prøv igjen - revert: Tilbakestill - save: Lagre - tags_backtolist: Tilbake til liste - tags_descriptions: Beskrivelser av '$1' - tags_findatag: Finn et merke - tags_findtag: Finn merkelapp - tags_matching: Populære merker som passer '$1̈́' - tags_typesearchterm: "Skriv inn et ord å lete etter:" - tip_addrelation: Legg til i en relasjon - tip_addtag: Legg til merke - tip_alert: Det oppstod en feil, trykk for detaljer - tip_anticlockwise: Sirkulær linje mot klokka, trykk for å snu - tip_clockwise: Sirkulær linje med klokka, trykk for å snu - tip_direction: Retning på linje, trykk for å snu - tip_gps: Vis GPS sporlogger (G) - tip_noundo: Ingenting å angre - tip_options: Sett valg (velg kartbakgrunn) - tip_photo: Last bilder - tip_presettype: Velg hva slags forhåndsinstillinger som blir vist i menyen - tip_repeattag: Gjenta merker fra sist valgte linje (R) - tip_revertversion: Velg versjonen det skal tilbakestilles til - tip_selectrelation: Legg til den valgte ruta - tip_splitway: Del linje i valgt punkt (X) - tip_tidy: Rydd opp punkter i vei (T) - tip_undo: Angre $1 (Z) - uploading: Laster opp ... - uploading_deleting_pois: Sletter POI-er - uploading_deleting_ways: Sletter veier - uploading_poi: Laster opp POI $1 - uploading_poi_name: Laster opp POI $1, $2 - uploading_relation: Laster opp relasjon $1 - uploading_relation_name: Laster opp relasjon $1, $2 - uploading_way: Laster opp linje $1 - uploading_way_name: Laster opp vei $1, $2 - warning: Advarsel! - way: Linje - "yes": Ja diff --git a/config/potlatch/locales/oc.yml b/config/potlatch/locales/oc.yml deleted file mode 100644 index e139c5123..000000000 --- a/config/potlatch/locales/oc.yml +++ /dev/null @@ -1,201 +0,0 @@ -# Messages for Occitan (Occitan) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Cedric31 -oc: - a_poi: $1 un POI - a_way: $1 un camin - action_addpoint: Apondon d'un punt a la fin d'un camin - action_cancelchanges: Anullacion de la modificacion - action_changeway: modificacion d'una rota - action_createparallel: crear de las rotas parallèlas - action_createpoi: Crear un POI (punt d'interès) - action_deletepoint: Supression d'un punt - action_insertnode: Apondre un punt sus un camin - action_mergeways: Jónher dos camins - action_movepoi: Desplaçar un POI - action_movepoint: Desplaçar un punt - action_moveway: Desplaçar un camin - action_pointtags: entrar las balisas sus un punt - action_poitags: entrar las balisas sus un POI - action_reverseway: Inversar lo sens del camin - action_revertway: restablir un camin - action_splitway: Copar un camin en dos - action_waytags: entrar las balisas sus un camin - advanced: Avançat - advanced_close: Tampar lo grop de modificacions - advanced_history: Istoric del camin - advanced_inspector: Inspector - advanced_maximise: Maximizar la fenèstra - advanced_minimise: Minimizar la fenèstra - advanced_parallel: Camin parallèl - advanced_tooltip: Accions de modificacion avançadas - advanced_undelete: Restablir - advice_bendy: Tròp de corbadura per alinhar (Maj per forçar) - advice_deletingpoi: Supression del POI (Z per anullar) - advice_deletingway: Supression del camin (Z per anullar) - advice_nocommonpoint: Los camins partejan pas de punt comun - advice_revertingpoi: Restabliment al darrièr POI salvat (Z per anullar) - advice_revertingway: Retorn al darrièr camin salvat (Z per anullar) - advice_tagconflict: Las balisas correspondon pas - Verificatz - advice_toolong: Tròp long per desblocar la situacion - Separatz lo camin en camins mai corts - advice_uploadempty: Pas res de mandar - advice_uploadfail: Mandadís arrestat - advice_uploadsuccess: Totas las donadas son estadas mandadas corrèctament - advice_waydragged: Camin desplaçat (Z per anullar) - cancel: Anullar - closechangeset: Tampadura del grop de modificacions - conflict_download: Telecargar sa version - conflict_overwrite: Espotir sa version - conflict_poichanged: Aprèp lo començament de vòstra modificacion, qualqu'un a modificat lo punt $1$2. - conflict_relchanged: Aprèp lo començament de vòstra modificacion, qualqu'un a modificat la relacion $1$2. - conflict_visitpoi: Clicatz sus « Ok » per far veire lo punt. - conflict_visitway: Clicatz sus 'Ok' per veire lo camin. - conflict_waychanged: Aprèp lo començament de vòstra modificacion, qualqu'un a modificat lo camin $1$2. - createrelation: Crear una relacion novèla - custom: "Personalizat :" - delete: Suprimir - deleting: Suprimir - drag_pois: Desplaçar de punts d'interès - editinglive: Modificacion en dirècte - editingoffline: Modificacion fòra linha - emailauthor: \n\nMercés de mandar un e-mail a richard\@systemeD.net per senhalar aqueste bug, en explicant çò que fasiatz quand s'es produch. - error_anonymous: Podètz pas contactar un mapaire anonim. - error_connectionfailed: O planhèm, la connexion al servidor OpenStreetMap a fracassat. Vòstres cambiaments recents se son pas enregistrats.\n\nVolètz ensajar tornamai ? - error_nopoi: Lo punt d'interès (POI) es introbable (benlèu avètz desplaçat la vista ?) doncas pòdi pas anullar. - error_nosharedpoint: "Los camins $1 e $2 an pas pus de punt en comun e doncas, pòdon pas èsser reempegats : l'operacion precedenta de separacion pòt èsser anullada." - error_noway: Lo camin $1 es pas estat trobat, pòt pas èsser restablit a son estat precedent. - error_readfailed: O planhèm, lo servidor d'OpenStreetMap a pas respondut a la demanda de donadas.\n\nVolètz ensajar tornamai ? - existingrelation: Apondre a una relacion existenta - findrelation: Trobar una relacion que conten - gpxpleasewait: Pacientatz pendent lo tractament de la traça GPX - heading_drawing: Dessenhar - heading_introduction: Introduccion - heading_pois: Cossí començar - heading_quickref: Referéncia rapida - heading_surveying: Relevar - heading_tagging: Balisatge - heading_troubleshooting: Reparacion - help: Ajuda - help_html: "Benvenguda sus Potlatch\nPotlatch es l'editor de bon utilizar per OpenStreetMap. Dessenhatz de rotas, camins, traças al sòl e magasins a partir de vòstras traças GPS, d'imatges satellit e de mapas ancianas.\n\nAquestas paginas d'ajuda vos van guidar pels prètzfaches basics dins l'utilizacion de Potlatch e vos indicar ont trobar mai d'informacions. Clicatz suls títols çaisús per començar.\n\nUn còp qu'avètz acabat, clicatz simplament endacòm mai dins la pagina.\n\n\n\nCausas utilas de saber\nCopietz pas dempuèi d'autras mapas !\n\nSe causissètz « Modificar en dirècte », totas las modificacions seràn transmesas a la banca de donadas a mesura que las dessenharetz (immediatament !). Se vos sentissètz pas segur, causissètz « Modificar amb salvament », e las modificacions seràn pas transmesas que quand clicaretz sus « Salvar ».\n\nLas modificacions qu'aportatz apareisson costumièrament sus la mapa aprèp una o doas oras (qualques modificacions pòdon prene una setmana). Tot apareis pas sus la mapa - perdriá sa clartat. Mas coma las donadas d'OpenStreetMap son open source, cadun es liure de crear de mapas qu'ofresson diferents aspèctes - coma OpenCycleMap o Midnight Commander.\n\nRemembratz-vos que s'agíd a l'encòp d'una polida mapa (doncas dessenhatz de corbas polidas pels viratges) e un diagrama (verificatz plan que las rotas se rejonhon a las joncions).\n\nAvèm plan dich de copiar pas dempuèi d'autras mapas ?\n\n\nTrobar mai d'informacions\nManual de Potlatch\nListas de difusion\nDiscussion en linha (ajuda en dirècte)\nForum web\nWiki de la comunautat\nCòde font de Potlatch\n\n\n\nComençar\nAra qu'avètz dobèrt Potlatch, clicatz sus « Modificar amb salvament » per començar.\n\nDoncas, sètz prèst a dessenhar una mapa. Çò mai aisit, per començar, es de plaçar de punts d'interès sus la mapa - de \"POIs\". Se pòt agir de bars, de glèisas, de garas ferroviàrias... tot çò que vos agrada.\n\nLissar e depausar\nPer far aquò superaisit, veiretz una seleccion dels POI (punts d'interès) los mai corrents, just en dejós de vòstra mapa. Ne plaçar un sus la mapa es tant aisit qu'aquò : clicatz-deplaçatz-lo cap a son emplaçament sus la mapa. E pas d'inquietud se lo plaçatz pas perfièchament del primièr còp : lo podètz desplaçar encara fins a que siá bon. Notatz que lo POI es suslinhat en jaune per mostrar qu'es seleccionat.\n\nOnce you've done that, you'll want to give your pub (or church, or station) a name. You'll see that a little table has appeared at the bottom. One of the entries will say \"name\" followed by \"(type name here)\". Do that - click that text, and type the name.\n\nClick somewhere else on the map to deselect your POI, and the colourful little panel returns.\n\nEasy, isn't it? Click 'Save' (bottom right) when you're done.\nMoving around\nTo move to a different part of the map, just drag an empty area. Potlatch will automatically load the new data (look at the top right).\n\nWe told you to 'Edit with save', but you can also click 'Edit live'. If you do this, your changes will go into the database straightaway, so there's no 'Save' button. This is good for quick changes and mapping parties.\n\nNext steps\nHappy with all of that? Great. Click 'Surveying' above to find out how to become a real mapper!\n\nSurveying with a GPS\nThe idea behind OpenStreetMap is to make a map without the restrictive copyright of other maps. This means you can't copy from elsewhere: you must go and survey the streets yourself. Fortunately, it's lots of fun!\nThe best way to do this is with a handheld GPS set. Find an area that isn't mapped yet, then walk or cycle up the streets with your GPS switched on. Note the street names, and anything else interesting (pubs? churches?) , as you go along.\n\nWhen you get home, your GPS will contain a 'tracklog' recording everywhere you've been. You can then upload this to OpenStreetMap.\n\nThe best type of GPS is one that records to the tracklog frequently (every second or two) and has a big memory. Lots of our mappers use handheld Garmins or little Bluetooth units. There are detailed GPS Reviews on our wiki.\n\nUploading your track\nNow, you need to get your track off the GPS set. Maybe your GPS came with some software, or maybe it lets you copy the files off via USB. If not, try GPSBabel. Whatever, you want the file to be in GPX format.\n\nThen use the 'GPS Traces' tab to upload your track to OpenStreetMap. But this is only the first bit - it won't appear on the map yet. You must draw and name the roads yourself, using the track as a guide.\nUsing your track\nFind your uploaded track in the 'GPS Traces' listing, and click 'edit' right next to it. Potlatch will start with this track loaded, plus any waypoints. You're ready to draw!\n\nYou can also click this button to show everyone's GPS tracks (but not waypoints) for the current area. Hold Shift to show just your tracks.\nUsing satellite photos\nIf you don't have a GPS, don't worry. In some cities, we have satellite photos you can trace over, kindly supplied by Yahoo! (thanks!). Go out and note the street names, then come back and trace over the lines.\n\nIf you don't see the satellite imagery, click the options button and make sure 'Yahoo!' is selected. If you still don't see it, it's probably not available for your city, or you might need to zoom out a bit.\n\nOn this same options button you'll find a few other choices like an out-of-copyright map of the UK, and OpenTopoMap for the US. These are all specially selected because we're allowed to use them - don't copy from anyone else's maps or aerial photos. (Copyright law sucks.)\n\nSometimes satellite pics are a bit displaced from where the roads really are. If you find this, hold Space and drag the background until it lines up. Always trust GPS tracks over satellite pics.\n\nDrawing ways\nTo draw a road (or 'way') starting at a blank space on the map, just click there; then at each point on the road in turn. When you've finished, double-click or press Enter - then click somewhere else to deselect the road.\n\nTo draw a way starting from another way, click that road to select it; its points will appear red. Hold Shift and click one of them to start a new way at that point. (If there's no red point at the junction, shift-click where you want one!)\n\nClick 'Save' (bottom right) when you're done. Save often, in case the server has problems.\n\nDon't expect your changes to show instantly on the main map. It usually takes an hour or two, sometimes up to a week.\nMaking junctions\nIt's really important that, where two roads join, they share a point (or 'node'). Route-planners use this to know where to turn.\n\nPotlatch takes care of this as long as you are careful to click exactly on the way you're joining. Look for the helpful signs: the points light up blue, the pointer changes, and when you're done, the junction point has a black outline.\nMoving and deleting\nThis works just as you'd expect it to. To delete a point, select it and press Delete. To delete a whole way, press Shift-Delete.\n\nTo move something, just drag it. (You'll have to click and hold for a short while before dragging a way, so you don't do it by accident.)\nMore advanced drawing\nIf two parts of a way have different names, you'll need to split them. Click the way; then click the point where it should be split, and click the scissors. (You can merge ways by clicking with Control, or the Apple key on a Mac, but don't merge two roads of different names or types.)\n\nRoundabouts are really hard to draw right. Don't worry - Potlatch can help. Just draw the loop roughly, making sure it joins back on itself at the end, then click this icon to 'tidy' it. (You can also use this to straighten out roads.)\nPoints of interest\nThe first thing you learned was how to drag-and-drop a point of interest. You can also create one by double-clicking on the map: a green circle appears. But how to say whether it's a pub, a church or what? Click 'Tagging' above to find out!\n\nWhat type of road is it?\nOnce you've drawn a way, you should say what it is. Is it a major road, a footpath or a river? What's its name? Are there any special rules (e.g. \"no bicycles\")?\n\nIn OpenStreetMap, you record this using 'tags'. A tag has two parts, and you can have as many as you like. For example, you could add highway | trunk to say it's a major road; highway | residential for a road on a housing estate; or highway | footway for a footpath. If bikes were banned, you could then add bicycle | no. Then to record its name, add name | Market Street.\n\nThe tags in Potlatch appear at the bottom of the screen - click an existing road, and you'll see what tags it has. Click the '+' sign (bottom right) to add a new tag. The 'x' by each tag deletes it.\n\nYou can tag whole ways; points in ways (maybe a gate or a traffic light); and points of interest.\nUsing preset tags\nTo get you started, Potlatch has ready-made presets containing the most popular tags.\n\nSelect a way, then click through the symbols until you find a suitable one. Then, choose the most appropriate option from the menu.\n\nThis will fill the tags in. Some will be left partly blank so you can type in (for example) the road name and number.\nOne-way roads\nYou might want to add a tag like oneway | yes - but how do you say which direction? There's an arrow in the bottom left that shows the way's direction, from start to end. Click it to reverse.\nChoosing your own tags\nOf course, you're not restricted to just the presets. By using the '+' button, you can use any tags at all.\n\nYou can see what tags other people use at OSMdoc, and there is a long list of popular tags on our wiki called Map Features. But these are only suggestions, not rules. You are free to invent your own tags or borrow from others.\n\nBecause OpenStreetMap data is used to make many different maps, each map will show (or 'render') its own choice of tags.\nRelations\nSometimes tags aren't enough, and you need to 'group' two or more ways. Maybe a turn is banned from one road into another, or 20 ways together make up a signed cycle route. You can do this with an advanced feature called 'relations'. Find out more on the wiki.\n\nUndoing mistakes\nThis is the undo button (you can also press Z) - it will undo the last thing you did.\n\nYou can 'revert' to a previously saved version of a way or point. Select it, then click its ID (the number at the bottom left) - or press H (for 'history'). You'll see a list of everyone who's edited it, and when. Choose the one to go back to, and click Revert.\n\nIf you've accidentally deleted a way and saved it, press U (for 'undelete'). All the deleted ways will be shown. Choose the one you want; unlock it by clicking the red padlock; and save as usual.\n\nThink someone else has made a mistake? Send them a friendly message. Use the history option (H) to select their name, then click 'Mail'.\n\nUse the Inspector (in the 'Advanced' menu) for helpful information about the current way or point.\nFAQs\nHow do I see my waypoints?\nWaypoints only show up if you click 'edit' by the track name in 'GPS Traces'. The file has to have both waypoints and tracklog in it - the server rejects anything with waypoints alone.\n\nMore FAQs for Potlatch and OpenStreetMap.\n\n\n\nWorking faster\nThe further out you're zoomed, the more data Potlatch has to load. Zoom in before clicking 'Edit'.\n\nTurn off 'Use pen and hand pointers' (in the options window) for maximum speed.\n\nIf the server is running slowly, come back later. Check the wiki for known problems. Some times, like Sunday evenings, are always busy.\n\nTell Potlatch to memorise your favourite sets of tags. Select a way or point with those tags, then press Ctrl, Shift and a number from 1 to 9. Then, to apply those tags again, just press Shift and that number. (They'll be remembered every time you use Potlatch on this computer.)\n\nTurn your GPS track into a way by finding it in the 'GPS Traces' list, clicking 'edit' by it, then tick the 'convert' box. It'll be locked (red) so won't save. Edit it first, then click the red padlock to unlock when ready to save.\n\nWhat to click\nDrag the map to move around.\nDouble-click to create a new POI.\nSingle-click to start a new way.\nHold and drag a way or POI to move it.\nWhen drawing a way\nDouble-click or press Enter to finish drawing.\nClick another way to make a junction.\nShift-click the end of another way to merge.\nWhen a way is selected\nClick a point to select it.\nShift-click in the way to insert a new point.\nShift-click a point to start a new way from there.\nControl-click another way to merge.\n\nKeyboard shortcuts\nB Add background source tag\nC Close changeset\nG Show GPS tracks\nH Show history\nI Show inspector\nJ Join point to what's below ways\n(+Shift) Unjoin from other ways\nK Lock/unlock current selection\nL Show current latitude/longitude\nM Maximise editing window\nP Create parallel way\nR Repeat tags\nS Save (unless editing live)\nT Tidy into straight line/circle\nU Undelete (show deleted ways)\nX Cut way in two\nZ Undo\n- Remove point from this way only\n+ Add new tag\n/ Select another way sharing this point\nDelete Delete point\n (+Shift) Delete entire way\nReturn Finish drawing line\nSpace Hold and drag background\nEsc Abort this edit; reload from server\n0 Remove all tags\n1-9 Select preset tags\n (+Shift) Select memorised tags\n (+S/Ctrl) Memorise tags\n§ or ` Cycle between tag groups\n\n" - hint_drawmode: Clic per apondre un punt\nClic doble/Entrada per acabar lo camin - hint_latlon: "lat $1\nlon $2" - hint_loading: Cargament dels camins en cors - hint_overendpoint: Sul darrièr punt del traçat\nClick per jónher\nShift-click per fusionar - hint_overpoint: Punt de dessús\nClick per jónher - hint_pointselected: Punt seleccionat\n(Shift-clic sul punt per\ncomençar una linha novèla) - hint_saving: salvament de las donadas - hint_saving_loading: Cargar/salvar las donadas - inspector: Inspector - inspector_in_ways: Dins los camins - inspector_latlon: "Lat $1\nLon $2" - inspector_locked: Varrolhat - inspector_not_in_any_ways: Pas present dins cap de camin (POI) - inspector_unsaved: Pas salvat - inspector_uploading: (mandadís) - inspector_way_connects_to: Connectat a $1 camins - inspector_way_connects_to_principal: Connècta a $1 $2 e $3 autres $4 - inspector_way_nodes: $1 noses - inspector_way_nodes_closed: $1 noses (tampat) - login_pwd: "Senhal :" - login_retry: Vòstre nom d'utilizaire del site es pas estat reconegut. Mercés de tornar ensajar. - login_title: Connexion impossibla - login_uid: "Nom d'utilizaire :" - mail: Corrièr electronic - more: Mai - newchangeset: "Mercés d'ensajar tornarmai : Potlatch començarà un grop de modificacions novèl." - nobackground: Pas de rèire plan - norelations: Pas cap de relacion dins l'espaci corrent - offset_broadcanal: Camin de tira de canal larg - offset_choose: Entrar lo descalatge (m) - offset_dual: Rota amb cauçadas separadas (D2) - offset_motorway: Autorota (D3) - offset_narrowcanal: Camin de tira de canal estrech - ok: OK - openchangeset: Dobertura d'un changeset - option_custompointers: Remplaçar la mirga pel Gredon e la Man - option_external: "Aviada extèrna :" - option_fadebackground: Rèire plan esclarzir - option_layer_cycle_map: OSM - mapa ciclista - option_layer_maplint: OSM - Maplint (errors) - option_layer_ooc_25k: Istoric UK al 1:25k - option_layer_ooc_7th: Istoric UK 7en - option_layer_ooc_npe: Istoric UK NPE - option_layer_tip: Causir lo rèire plan d'afichar - option_noname: Metre en evidéncia las rotas pas nomenadas - option_photo: "Fòto KML :" - option_thinareas: Utilizar de linhas mai finas per las surfàcias - option_thinlines: Utilizar un trach fin a totas las escalas - option_tiger: Veire las donadas TIGER pas modificadas - option_warnings: Far veire los avertiments flotants - point: Punt - preset_icon_airport: Aeropòrt - preset_icon_bar: Bar - preset_icon_bus_stop: Arrèst de bus - preset_icon_cafe: Cafè - preset_icon_cinema: Cinèma - preset_icon_convenience: Espiçariá - preset_icon_fast_food: Restauracion rapida - preset_icon_ferry_terminal: Terminal de ferry - preset_icon_fire_station: Casèrna de pompièrs - preset_icon_hospital: Espital - preset_icon_hotel: Ostalariá - preset_icon_museum: Musèu - preset_icon_parking: Parcatge d'estacionament - preset_icon_pharmacy: Farmàcia - preset_icon_place_of_worship: Luòc de culte - preset_icon_police: Pòste de polícia - preset_icon_post_box: Bóstia de letras - preset_icon_pub: Pub - preset_icon_recycling: Reciclatge - preset_icon_restaurant: Restaurant - preset_icon_school: Escòla - preset_icon_station: Gara - preset_icon_supermarket: Supermercat - preset_icon_taxi: Estacion de taxis - preset_icon_telephone: Telefòn - preset_icon_theatre: Teatre - preset_tip: Causir dins un menut de balisas preseleccionadas que descrivon lo $1 - prompt_addtorelation: Apondre $1 a la relacion - prompt_changesetcomment: "Entratz una descripcion de vòstras modificacions :" - prompt_closechangeset: Tampar lo grop de modificacions $1 - prompt_createparallel: Crear un camin parallèl - prompt_editlive: Modificar en dirècte - prompt_editsave: Modificar amb salvament - prompt_helpavailable: Utilizaire novèl ? Agachatz en bas a esquèrra per d'ajuda - prompt_launch: Aviar una URL extèrna - prompt_revertversion: "Tornar a una version salvada mens recenta :" - prompt_savechanges: Salvar las modificacions - prompt_taggedpoints: D'unes punts d'aqueste camin son balisats. Los volètz suprimir? - prompt_track: Conversion d'una traça GPS en camin (varrolhat) per l'edicion - prompt_welcome: Benvengut sus OpenStreetMap! - retry: Ensajatz tornarmai - revert: Revocar - save: Salvar - tip_addrelation: Apondre a una relacion - tip_addtag: Apondre una balisa novèla - tip_alert: Una error s'es producha - Clicatz per mai de detalhs - tip_anticlockwise: Circulacion dins lo sens invèrse del de las agulhas d'un relòtge (trigonometric) - Clicatz per inversar lo sens - tip_clockwise: Circulacion dins lo sens de las agulhas d'un relòtge - Clicatz per inversar lo sens - tip_direction: Direccion del camin - Clicatz per inversar - tip_gps: Afichar las traças GPS (G) - tip_noundo: Pas res d'anullar - tip_options: Opcions (causida de la carta de rèire plan) - tip_photo: Cargar de fòtos - tip_presettype: Seleccionar lo tipe de paramètres prepausats dins lo menut de seleccion. - tip_repeattag: Recopiar las balisas del camin seleccionat precedentament (R) - tip_revertversion: Causissètz la version cap a la quala tornar - tip_selectrelation: Apondre a la rota causida - tip_splitway: Separar lo camin al punt seleccionat (X) - tip_tidy: Lissar los punts del camin (T) - tip_undo: Anullar l'operacion $1 (Z) - uploading: Mandadís... - uploading_deleting_pois: Supression dels POI - uploading_deleting_ways: Supression de camins - uploading_poi: Mandadís del POI $1 - uploading_poi_name: Mandadís del POI $1, $2 - uploading_relation: Mandadís de la relacion $1 - uploading_relation_name: Mandadís de la relacion $1, $2 - uploading_way: Mandadís del camin $1 - uploading_way_name: Mandadís del camin $1, $2 - way: Camin diff --git a/config/potlatch/locales/pl.yml b/config/potlatch/locales/pl.yml deleted file mode 100644 index 334d44328..000000000 --- a/config/potlatch/locales/pl.yml +++ /dev/null @@ -1,234 +0,0 @@ -# Messages for Polish (Polski) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Ajank -# Author: BdgwksxD -# Author: Deejay1 -# Author: Soeb -# Author: Sp5uhe -# Author: Yarl -pl: - a_poi: $1 punkt POI - a_way: $1 drogę - action_addpoint: dodanie punktu na końcu drogi - action_cancelchanges: anulowanie zmian do - action_changeway: zmiany drogi - action_createparallel: tworzenie równoległej drogi - action_createpoi: utworzenie POI - action_deletepoint: usunięcie punktu - action_insertnode: dodanie punktu na drodze - action_mergeways: łączenie dwóch dróg - action_movepoi: przesunięcie POI - action_movepoint: przesunięcie punktu - action_moveway: przesunięcie drogi - action_pointtags: ustawienie znacznika dla punktu - action_poitags: ustawianie tagów na punkcie POI - action_reverseway: odwrócenie kierunku drogi - action_revertway: przywrócenie drogi - action_splitway: dzielenie drogi - action_waytags: ustawienie znacznika dla drogi - advanced: Zaawansowane - advanced_close: Zamknij zestaw zmian - advanced_history: Historia drogi - advanced_inspector: Inspektor - advanced_maximise: Maksymalizuj okno - advanced_minimise: Minimalizuj okno - advanced_parallel: Równoległa droga - advanced_tooltip: Działania zaawansowanej edycji - advanced_undelete: Odtwórz - advice_bendy: Zbyt pochylone, aby wyprostować (SHIFT, aby zmusić) - advice_conflict: Konflikt na serwerze – możesz spróbować zapisać ponownie - advice_deletingpoi: Punkt POI usunięty (Z, aby cofnąć) - advice_deletingway: Droga usunięta (Z, aby cofnąć) - advice_microblogged: Aktualizuj twój status na $1 - advice_nocommonpoint: Drogi nie mają podzielonego wspólnego punktu - advice_revertingpoi: Przywrócono do ostatnio zapisanego punktu POI (Z, aby cofnąć) - advice_revertingway: Przywrócono do ostatnio zapisanej drogi (Z, aby cofnąć) - advice_tagconflict: Znaczniki nie pasują do siebie – proszę sprawdzić (Z, aby cofnąć) - advice_toolong: Zbyt długa droga, aby odblokować – rozdziel do krótszych dróg - advice_uploadempty: Brak danych do przesłania - advice_uploadfail: Przesyłanie zatrzymane - advice_uploadsuccess: Dane zostały przesłane - advice_waydragged: Droga przesunięta (Z, aby cofnąć) - cancel: Anuluj - closechangeset: Zamykanie zestawu zmian - conflict_download: Pobierz swoją wersję - conflict_overwrite: Zastąp tą wersję - conflict_poichanged: Od rozpoczęcia edycji, ktoś zmienił punkt $1$2 - conflict_relchanged: Od rozpoczęcia edycji, ktoś zmienił relację $1$2. - conflict_visitpoi: Kliknij 'OK', aby pokazać punkt. - conflict_visitway: Kliknij 'OK' aby pokazać drogę. - conflict_waychanged: Po rozpoczęciu edytowania, ktoś zmienił drogę $1$2. - createrelation: Utwórz nową relację - custom: "Własne:" - delete: Usuń - deleting: usuwanie - drag_pois: Przeciągnij i upuść punkty użyteczności publicznej - editinglive: Edycja na żywo - editingoffline: Edycja offline - emailauthor: \n\nPrześlij e‐mail do richard\@systemeD.net z raportem o błędach, opisując co teraz robiłeś. - error_anonymous: Nie możesz się skontaktować z anonimowym użytkownikiem. - error_connectionfailed: Połączenie z serwerem OpenStreetMap zostało przerwane. Niezapisane zmiany zostały utracone. \n\nCzy chcesz spróbować ponownie? - error_microblog_long: "Wysyłanie do $1 niedostępne:\nKod HTTP: $2\nWiadomość o błędach: $3\nBłąd $1: $4" - error_nopoi: Nie można znaleźć punktu POI (może jest za daleko?) więc nie można cofnąć. - error_nosharedpoint: Drogi $1 i $2 nie mają więcej wspólnych punktów, więc nie mogę cofnąć podzielonego. - error_noway: Nie można znaleźć drogi $1 (może jest za daleko?), więc nie mogę cofnąć. - error_readfailed: Serwer OpenStreetMap nie odpowiedział na pytanie o dane. \n\nCzy chcesz spróbować ponownie? - existingrelation: Dodaj do istniejącej relacji - findrelation: Znajdź relację zawierającą - gpxpleasewait: Poczekaj chwilę, gdy ślad GPX jest przetwarzany. - heading_drawing: Rysowanie - heading_introduction: Wstęp - heading_pois: Pierwsze kroki - heading_quickref: Szybkie odniesienie - heading_surveying: Badanie - heading_tagging: Tagowanie - heading_troubleshooting: Rozwiązywanie problemów - help: Pomoc - help_html: "Witamy w Potlatch‐u\nPotlatch jest łatwym w obsłudze edytorem danych dla OpenStreetMap. Rysuje drogi, ścieżki, zabytki oraz sklepy na podstawie wytyczonych przez Ciebie ścieżek GPS, zdjęć satelitarnych lub starych map.\n\nTe strony pomocy przybliżą Ci podstawy korzystania z Potlatch‐a i powiedzą Ci gdzie znaleźć więcej informacji. Kliknij na nagłówek powyżej, aby rozpocząć.\n\nGdy już skończysz czytać, wystarczy, że klikniesz gdziekolwiek na stronie.\n\n\n\nPrzydatne informacje, które warto wiedzieć\nNie kopiuj informacji z innych map!\n\nJeśli wybierzesz opcję „Edytuj na żywo“, każda zmiana którą zrobisz zostanie zapisana w bazie danych tak jak ją wprowadzisz – natychmiast. Jeśli nie jesteś zbyt pewny, wybierz „Edytuj offline“, a dane zostaną przesłane dopiero gdy naciśniesz „Zapisz“.\n\nKażda edycja, którą zrobisz zazwyczaj pojawi się na mapie po upływie godziny do dwóch (niektóre zmiany wymagają tygodnia). Nie wszystko jest prezentowane na mapie – powodowałoby to zbyt duży bałagan. Jednak ponieważ dane OpenStreetMap są udostępniane na wolnych zasadach, inni mogą z nich korzystać do wykonywania map pokazujących różne aspekty – takich jak \nOpenCycleMap lub Midnight Commander.\n\nPamiętaj, że budujesz zarówno dobrze wyglądającą mapę (dokładnie rysuj zakręty), jak i schematem (doprowadzaj drogi przyłączając je do skrzyżowań).\n\nCzy wspominaliśmy o zakazie kopiowania z innych map?\n\n\nWięcej informacji\nPodręcznik Potlatch‐a\nListy dyskusujne\nCzat (pomoc na żywo)\nForum\nWiki OpenStreetMap\nKod źródłowy Potlatch‐a\n\n\n\nPierwsze kroki\nTeraz, gdy Potlatch jest uruchomiony, kliknij „Edytuj offline“, aby rozpocząć.\n\nBądź gotów do kreślenia mapy. Najprościej rozpocząć poprzez wprowadzenie na mapie kilku punktów użyteczności publicznej lub punktów zainteresowania POI. Mogą to być puby, kościoły, stacje kolejowe... wszystko co zechcesz.\n\nPrzeciągnij i upuść\nRobienie tego jest bardzo łatwe, zobaczysz wybór najczęstszych punktów POI, w prawym, dolnym rogu mapy. Przeciągnij symbol w odpowiednie miejsce na mapie. Nie martw się, gdy nie ustawisz dokładnej pozycji za pierwszym razem – możesz przeciągać symbol wielokrotnie dopóki pozycja nie będzie idealna. Należy pamiętać, że punkt zainteresowań POI jest zaznaczony na żółto wtedy gdy jest wybrany.\n\nPo zakończeniu ustawiania lokalizacji, będziesz mógł nadać pubowi (kościołowi lub stacji) nazwę. Zwróć uwagę, że na dole pojawiła się mała ramka. Jedno z pół nazywa się „Nazwa“ i zawiera treść „(wpisz nazwę tutaj)“. Zrób to – kliknij na tekst i wpisz nazwę.\n\nKliknij gdziekolwiek na mapie, aby odznaczyć twój punkt POI i aby przywrócić kolorowy, mały panel.\n\nProste, prawda? Kliknij 'Zapisz' (prawy, dolny róg), gdy skończysz.\nPoruszanie się\nAby przejść do innej części mapy, wystarczy przeciągnąć na pusty obszar. Potlatch automatycznie pobierze nowe dane (patrz na prawy, górny róg).\n\nPowiedzieliśmy Ci już o opcji 'Edytuj offline', ale możesz też kliknąć przycisk 'Edytuj na żywo'. Gdy to zrobisz, twoje zmiany zostaną od razu zapisane do bazy danych, więc nie ma przycisku 'Zapisz'. To jest dobre dla szybkich zmian i mapowania stron.\n\nKolejne kroki\nJesteś szczęśliwy z wszystkiego o tym? Świetnie. Kliknij 'Badanie' powyżej, aby dowiedzieć się jak stać się prawdziwym maperem!\n\nBadanie z GPS‐em\nIdeą OpenStreetMap jest, aby robić mapę bez restrykcyjnych praw autorskich innych map. Oznacza to, że nie można skopiować z zewnątrz: musisz iść i zbadać ulice dla siebie. Na szczęście, to mnóstwo zabawy!\nNajlepiej zrobić to z ręcznym zestawem GPS. Znajdź obszar, który nie został jeszcze zmapowany, następnie pieszo lub rowerem wyjdź na ulice z włączonym GPS‐em.\nZwróć uwagę na nazwy ulic i więcej ciekawych rzeczy (puby, kościoły itd...), jak idziesz.\n\nGdy wrócisz do domu, twój GPS będzie zawierać zapis 'tracklog' zapisujący ścieżki tam gdzie byłeś. Możesz wgrać to do OpenStreetMap.\n\nNajlepszy typ GPS jest taki, że zapisy zapisują się wielokrotnie do tracklog‐u (co sekundę lub dwie) i ma dużo pojemności. Wiele naszych maperów używa ręcznych Garminów lub małych jednostek Bluetooth. Więcej informacji Opinie GPS na naszej wiki.\n\nWgrywanie twojego śladu\nTeraz potrzebujesz dostać twoje ślady z zestawu GPS. Może twój GPS przyszedł z kilkoma programami lub może to umożliwia kopiowanie plików za pośrednictwem portu USB. Jeśli nie, wypróbuj GPSBabel. Jeśli chcesz, żeby plik był w formacie GPX.\n\nNastępnie użyj zakładki 'Ślady GPS', aby przesłać twoje ślady do OpenStreetMap. Ale to tylko pierwszy kawałek – to nie pojawi się jeszcze na mapie. Musisz narysować i nazwać drogi, używając śladów jako przewodnika.\nUżywanie twojego śladu\nZnajdź twoje wgrane ślady w zakładce 'Ślady GPS' i kliknij 'Edycja' tuż obok . Potlatch uruchomi się z tymi załadowanymi śladami wraz z punktami drogowymi. Bądź gotowy do rysowania!\n\nMożesz również kliknąć ten przycisk, aby pokazać wszystkim ślady GPS (ale nie punkty drogowe) dla obecnego obszaru. Przytrzymaj klawisz Shift, aby pokazać jedynie twoje ślady.\nUżywanie zdjęć satelitarnych\nJeżeli nie masz GPS‐a, nie martw się. W niektórych miastach, mamy zdjęcia satelitarne, możesz dzięki nim zaznaczać różne rzeczy, uprzejmie dostarczone przez Yahoo! (dzięki!). Wyjdź i zapamiętaj nazwy ulic, później wróć i przekopiuj nazwy na linie.\n\nJeżeli nie widzisz zdjęć satelitarnych, kliknij przycisk 'Ustaw opcje (wybierz mapę tła)' i upewnij się, że 'Yahoo!' jest zaznaczone. Jeśli wciąż nie widać, prawdopodobnie zdjęcia są niedostępne w twoim mieście, lub będziesz musiał przybliżyć mapę.\n\nW tej samej opcji możesz znaleźć kilka innych opcji takich jak mapa Wielkiej Brytanii nie objęta prawami autorskimi, i OpenTopoMap dla Stanów Zjednoczonych. Te wszystkie są specjalnie wybrane, ponieważ będziemy mogli z nich korzystać – nie kopiuj z cudzych map lub zdjęć lotniczych. (Ustawa o prawach autorskich.)\n\nCzasami zdjęcia satelitarne są nieco inaczej położone niż ulice na prawdę. Jeśli się to okaże, przytrzymaj Spację i przeciągnij przestrzeń tła, aż do linii. Zawsze bardziej ufaj śladom GPS niż zdjęciom satelitarnym.\n\nRysowanie ulic\nAby narysować drogę (lub ulicę) zacznij na pustym miejscu na mapie, wystarczy kliknąć na mapie; wtedy będą pojawiać się poszczególne punkty na drodze. Gdy już skończysz, kliknij dwa razy myszką lub wciśnij Enter – kliknij gdzieś indziej, aby odznaczyć drogę.\n\nAby narysować drogę zaczynając od innej, kliknij na nią, aby ją zaznaczyć; punkty zostaną zaznaczone na czerwono. Przytrzymaj Shift i kliknij jeden z nich, aby zacząć nową drogę od tego punktu. (Jeżeli nie ma czerwonego punktu na skrzyżowaniu, kliknij klawisz Shift jeżeli chcesz, aby został zaznaczony jeden!)\n\nKliknij 'Zapisz' (prawy, dolny róg) gdy skończysz. Zapisuj często, w przypadku gdy serwer ma problemy.\n\nNie oczekuj twoich zmian, aby pokazać na mapie. To zazwyczaj trwa godzinę lub dwie, czasami nawet tydzień.\nRobienie skrzyżowań\nTo naprawdę ważne, że, jak dwie drogi są połączone mają punkt (lub 'węzeł'). Planerzy trasy, używają tego, by wiedzieć gdzie się zwrócić.\n\nPotlatch dba o to jak długo jesteś ostrożny, aby kliknąć dokładnie na drogę którą dodajesz. Szukaj pomocnych znaków: punkty robią się niebieskie, wskaźnik zmian, a kiedy skończysz, punkt połączenia, będzie miał czarny zarys.\nPrzenoszenie i usuwanie\nDziała to tak, jak możesz się tego spodziewać. Aby usunąć punkt, zaznacz go i naciśnij klawisz Delete. Aby usunąć całą drogę, naciśnij na klawiaturze Shift+Delete.\n\nAby coś przenieść, wystarczy to przeciągnąć. (Musisz kliknąć i przytrzymać przez chwilę przed przeciągnięciem drogi, więc nie zrobisz tego przez przypadek.)\nBardziej zaawansowane rysowanie\nJeśli dwie części drogi mają różne nazwy, będziesz musiał je podzielić. Kliknij drogę; później kliknij punkt, w którym powinna zostać podzielona, i kliknij na nożyczki. (Możesz połączyć drogi klikając Kontrolę, lub klucz Apple na Mac, ale nie łącz dwóch dróg z innymi nazwami lub typami.)\n\nRonda są naprawdę trudne do narysowania. Nie martw się – Potlatch umie pomóc. Wystarczy narysować pętlę w przybliżeniu, upewniając się, czy obydwa końce łączą się ze sobą, później kliknij ikonę 'Uporządkuj punkty na trasie'. (Możesz również użyć tego do wyprostowania drogi.)\nPunkty użyteczności publicznej\nPierwsza rzecz, którą się nauczysz, będzie jak przeciągnąć i upuścić punkty użyteczności publicznej. Możesz również utworzyć jeden punkt klikając podwójnie myszką na mapie: kółko wydawać się będzie zielone. Ale jak wskazać czy to pub, kościół, czy co? Kliknij 'Dodawanie znaczników' powyżej, aby się dowiedzieć!\n\nJaki to typ drogi?\nGdy raz narysowałeś drogę, należy przedstawić co to jest. Czy jest to główna droga, chodnik czy rzeka? Jaka jest nazwa? Czy istnieją jakieś specjalne przepisy (np. \"zakaz wjazdu rowerów\")?\n\nW OpenStreetMap, pokazujesz to używając 'znaczników'. Znacznik składa się z dwóch części, i możesz mieć tam tyle ile zechcesz. Na przykład można dodać highway | trunk, aby pokazać, że jest to droga główna (w większości przypadków w Polsce, będzie to droga ekspresowa); highway | residential dla drogi osiedlowej; lub highway | footway dla chodnika. Jeśli jazda rowerem jest zakazana, możesz później dodać bicycle | no. Później, aby pokazać nazwę, dodaj name | nazwa.\n\nZnaczniki w Potlatch‐u pojawią się na dole ekranu – kliknij na istniejącą drogę i zobaczysz jakie znaczniki posiada. Kliknij na znaczek '+' (prawy, dolny róg), aby dodać nowy znacznik. Kliknij na znaczek 'x', aby usunąć znacznik.\n\nMożesz opisać całe drogi; punkty na drogach (może szlaban lub sygnalizację świetlną); i punkty użyteczności publicznej.\nKorzystanie z gotowych znaczników\nAby zacząć, Potlatch zawiera gotowe przykłady zawierające najpopularniejsze znaczniki.\n\nZaznacz drogę, później klikaj na symbole, dopóki nie znajdziesz odpowiedniego. Później, wybierz najwłaściwszą opcję z menu.\n\nW ten sposób wypełnisz znaczniki. Niektóre znaczniki zostaną częściowo puste, więc możesz wpisać (na przykład) nazwę drogi i numer.\nDrogi jednokierunkowe\nMożesz dodać znacznik oneway | yes – ale jak zobaczyć jaki to kierunek? W lewym, dolnym rogu jest strzałka wskazująca kierunek drogi, od początku do końca. Kliknij ją, aby odwrócić kierunek.\nWybieranie swoich własnych znaczników\nOczywiście, nie musisz się ograniczać tylko do przykładów. Poprzez używanie przycisku '+', możesz użyć każdy znacznik na wszystkim.\n\nMożesz zobaczyć jakich znaczników używają inni ludzie na OSMdoc i jest też długa lista popularnych znaczników na naszej wiki o nazwie Składniki mapy. Ale to tylko sugestie, nie zasady. Jesteś wolny od wymyślania własnych znaczników lub pożyczania od innych.\n\nPonieważ dane OpenStreetMap są używane do różnych map, każdej mapie pojawią się (lub 'zrenderują się')również nasze znaczniki.\nRelacje\nCzasem znaczniki są nie wystarczające i musisz dodać do 'grupy' dwie lub więcej dróg. Może obracanie jest zakazane z jednej drogi do innej, lub 20 dróg tworzą podpisaną trasę rowerową. Możesz to zrobić dzięki zaawansowanej funkcji zwanej 'relacje'. Dowiedz się więcej na wiki.\n\nCofanie pomyłek\nTo jest przycisk cofania (możesz nacisnąć Z) – cofa ostatnią czynność, którą wykonałeś.\n\nMożesz 'wrócić' do ostatnio zapisanej wersji drogi lub punktu. Zaznacz go, potem kliknij na jego ID (numer w lewym, dolnym rogu) – lub kliknij H (aby pokazać 'historię'). Zobaczysz listę edytowań (kto edytował i kiedy). Wybierz jeden z nich, aby powrócić do tej wersji i kliknij 'Cofnij'.\n\nJeśli przypadkowo usunąłeś drogę i to zapisałeś, naciśnij U, aby przywrócić. Wszystkie usunięte drogi zostaną pokazane. Kliknij na jedną z nich; odblokuj ją za pomocą kliknięcia czerwonej kłódki; i jak zwykle zapisz.\n\nMyślisz, że ktoś zaliczył pomyłkę? Wyślij mu wiadomość. Użyj opcję 'Historia' (H), aby zaznaczyć jego nazwę, potem kliknij 'Wiadomość'.\n\nUżyj Inspektora (w menu 'Zaawansowane'), aby uzyskać pomocne informacje o bieżącej drodze, czy punkcie.\nFAQ\nJak mogę zobaczyć moje punkty drogowe?\nPunkty drogowe pokazują się jedynie, gdy naciśniesz 'Edycja' poprzez nazwę trasy w 'Ścieżkach GPS'. Plik musi mieć zarówno punkty, jak i zapisy tras – serwer odrzuca pustkę z samymi punktami drogowymi.\n\nWięcej pytań dla Potlatch‐a i OpenStreetMap.\n\n\n\nSzybsza praca\nIm bardziej zmniejszysz obraz, tym więcej danych Potlatch będzie miał do załadowania. Zwiększ obraz przed kliknięciem 'Edycja'.\n\nOdznacz opcję 'Pióro i rączka jako wskaźniki' (w oknie opcji), aby uzyskać maksymalne tempo.\n\nJeżeli serwer pracuje wolniej, spróbuj ponownie później. Przejrzyj wiki, aby zobaczyć znane problemy. Czasami, w niedzielne wieczory, jest zawsze zajęty.\n\nWskaż Potlatch‐owi twoje ulubione zestawy znaczników, aby je zapamiętał. Wybierz drogę lub punkt z tymi znacznikami, potem kliknij Ctrl, Shift i numer od 1 do 9. Później, aby znowu zastosować te znaczniki, wystarczy kliknąć Shift i wybraną cyfrę. (Będą pamiętać przy każdym użyciu Potlatch‐a na tym komputerze.)\n\nZmień swój ślad GPS w drodze, znajdując go w liście 'Ścieżki GPS', klikając 'edytuj' przez nią, potem zaznaczając pole 'konwertuj'. To będzie zablokowane (kolor czerwony) więc nie zapisze. Najpierw edytuj, potem kliknij na czerwoną kłódkę, aby odblokować, wtedy będzie można zapisać.\n\nCo kliknąć\nPrzeciągaj mapę, aby się poruszać.\nKliknij dwa razy, aby utworzyć nowy punkt POI.\nKliknij normalnie, aby zacząć rysowanie nowej drogi.\nTrzymaj i przeciągaj drogę lub punkt POI, aby go przesunąć.\nGdy rysujesz drogę\nKliknij dwa razy lub naciśnij Enter, aby skończyć rysowanie.\nKliknij na inną drogę, aby stworzyć węzeł.\nKliknij Shift na końcu innej drogi, aby połączyć.\nGdy droga jest zaznaczona\nKliknij na punkt, aby go zaznaczyć.\nKliknij Shift na drodze, aby wstawić nowy punkt.\nKliknij Shift na punkcie, aby zacząć od niego nową drogę.\nKliknij Control (Ctrl) na innej drodze, aby połączyć.\n\nSkróty klawiszowe\nB Dodaj znacznik źródła tła.\nC Zamknij zestaw zmian\nG Pokaż ścieżki GPS\nH Pokaż historię\nI Pokaż inspektora\nJ Dołącz punkt do krzyżujących się dróg\n(+Shift) Unjoin from other ways\nK Zablokj/odblokuj obecne zaznaczenie\nL Pokaż obecną szerokość/długość geograficzną\nM Maksymalizuj okno edycji\nP Utwórz równoległą drogę\nR Powtórz znaczniki\nS Zapisz (chyba że Edycja na żywo)\nT Uporządkuj do prostej linii/okręgu\nU Przywróć (pokaż usunięte drogi)\nX Przetnij drogę w dwie\nZ Cofnij\n- Usuń punkt tylko z tej drogi\n+ Dodaj nowy znacznik\n/ Zaznacz inną drogę używającą ten punkt\nDelete Usuń punkt\n (+Shift) Usuń całą drogę\nReturn Zakończ rysowanie linii\nSpacja Przytrzymaj i przeciągnij w tle\nEsc Przerwij tę edycję; pobierz ponownie dane z serwera\n0 Usuń wszystkie znaczniki\n1‐9 Zaznacz ustawione znaczniki\n (+Shift) Wybierz zapamiętane znaczniki\n (+S/Ctrl) Zapamiętaj znaczniki\n$ lub ` Cykl pomiędzy grupami znaczników\n\n" - hint_drawmode: kliknij, aby dodać punkt\n, kliknij dwa razy/Return\n, aby zakończyć rysowanie linii - hint_latlon: "Szer. $1\nDł. $2" - hint_loading: wczytywanie danych - hint_overendpoint: nad punktem końcowym ($1)\nkliknij, aby dołączyć\nkliknij shift, aby włączyć - hint_overpoint: powyżej punktu ($1) kliknij aby dołączyć - hint_pointselected: punkt zaznaczony\n(kliknij Shift, aby\nzacząć rysowanie nowej linii) - hint_saving: zapisywanie danych - hint_saving_loading: wczytywanie/zapisywanie danych - inspector: Inspektor - inspector_duplicate: Duplikat - inspector_in_ways: W drogach - inspector_latlon: "Szer. $1\nDł. $2" - inspector_locked: Zablokowane - inspector_node_count: ($1 razy) - inspector_not_in_any_ways: Nic w każdych drogach (POI) - inspector_unsaved: Niezapisane - inspector_uploading: (przesyłanie) - inspector_way_connects_to: Łączenia do $1 dróg - inspector_way_connects_to_principal: "Połączenia: $1 $2 oraz $3 innych $4" - inspector_way_nodes: $1 węzłów - inspector_way_nodes_closed: $1 węzłów (zamknięte) - loading: Ładowanie... - login_pwd: Hasło - login_retry: Twoja strona logowania nie została uznana. Spróbuj ponownie. - login_title: Błąd logowania - login_uid: Nazwa użytkownika - mail: Wiadomość - more: Więcej - newchangeset: "Spróbuj ponownie: Potlatch uruchomi nowy zestaw zmian." - "no": Nie - nobackground: Bez tła - norelations: Brak relacji na obecnym obszarze - offset_broadcanal: Szeroka, kanałowa ścieżka holownicza - offset_choose: Wybierz tło (m) - offset_dual: Droga dwupasmowa (D2) - offset_motorway: Autostrada (D3) - offset_narrowcanal: Wąskie, kanałowe ścieżki holownicze - ok: OK - openchangeset: Otwieranie zestawu zmian - option_custompointers: Pióro i rączka jako wskaźniki - option_external: "Rozpoczęcie zewnętrzne:" - option_fadebackground: Przyciemnione tło - option_layer_cycle_map: OSM – mapa rowerowa - option_layer_maplint: OSM – Maplint (błędy) - option_layer_nearmap: "Australia: NearMap" - option_layer_ooc_25k: "Mapa historyczna Wielkiej Brytanii: 1:25k" - option_layer_ooc_7th: "Mapa historyczna Wielkiej Brytanii: 7th" - option_layer_ooc_npe: "Mapa historyczna Wielkiej Brytanii: NPE" - option_layer_ooc_scotland: Historia UK – Szkocja - option_layer_os_streetview: UK – OS StreetView - option_layer_streets_haiti: "Haiti: nazwy ulic" - option_layer_surrey_air_survey: UK – badanie hrabstwa Surrey z lotu ptaka - option_layer_tip: Wybierz tło - option_limitways: Ostrzegaj, gdy wczytuje się dużo danych - option_microblog_id: "Nazwa Microbloga:" - option_microblog_pwd: "Hasło do Microbloga:" - option_noname: Wyróżnij nienazwane drogi - option_photo: Obraz KML - option_thinareas: Użyj cieńszych linii dla większych obszarów - option_thinlines: Używaj cieńszych linii na wszystkich skalach - option_tiger: Wyróżnij zmiany TIGER - option_warnings: Pokazuj pływające uwagi - point: Punkt - preset_icon_airport: Lotnisko - preset_icon_bar: Bar - preset_icon_bus_stop: Przystanek - preset_icon_cafe: Kawiarnia - preset_icon_cinema: Kino - preset_icon_convenience: Sklepik spożywczo‐przemysłowy - preset_icon_disaster: Budynek haitaiński - preset_icon_fast_food: Fast food - preset_icon_ferry_terminal: Prom - preset_icon_fire_station: Remiza strażacka - preset_icon_hospital: Szpital - preset_icon_hotel: Hotel - preset_icon_museum: Muzeum - preset_icon_parking: Parking - preset_icon_pharmacy: Apteka - preset_icon_place_of_worship: Miejsce kultu - preset_icon_police: Posterunek policji - preset_icon_post_box: Skrzynka - preset_icon_pub: Pub - preset_icon_recycling: Recykling - preset_icon_restaurant: Restauracja - preset_icon_school: Szkoła - preset_icon_station: Stacja kolejowa - preset_icon_supermarket: Supermarket - preset_icon_taxi: Postój taksówek - preset_icon_telephone: Telefon - preset_icon_theatre: Teatr - preset_tip: Wybierz z menu gotowych tagów opisujących $1 - prompt_addtorelation: Dodaj $1 do relacji - prompt_changesetcomment: Opisz wykonane zmiany - prompt_closechangeset: Zamknij edycję $1 - prompt_createparallel: Tworzenie równoległej drogi - prompt_editlive: Edytuj na żywo - prompt_editsave: Edytuj offline - prompt_helpavailable: Jesteś nowym użytkownikiem? Pomoc odnajdziesz w lewym dolnym rogu. - prompt_launch: Uruchom zewnętrzne URL - prompt_live: W edycji na żywo, każdy element, który zmienisz zostanie natychmiast zapisany w bazie danych OpenStreetMap – to nie jest zalecane dla początkujących. Czy na pewno? - prompt_manyways: Ten obszar jest bardzo szczegółowy i będzie długi czas ładowania. Czy chcesz zbliżyć mapę? - prompt_microblog: Wiadomość do $1 (pozostało $2) - prompt_revertversion: "Cofnij do wcześniej zapisanej wersji:" - prompt_savechanges: Zapisz zmiany - prompt_taggedpoints: Niektóre z punktów na tej trasie są opisane lub pozostają w relacjach. Czy na pewno chcesz usunąć? - prompt_track: Konwersja śladów GPS na drogi - prompt_unlock: Kliknij, aby otworzyć - prompt_welcome: Witaj w OpenStreetMap! - retry: Spróbuj ponownie - revert: Cofnij - save: Zapisz - tags_backtolist: Powrót do listy - tags_descriptions: Opis '$1' - tags_findatag: Szukaj znacznika - tags_findtag: Szukaj znacznika - tags_matching: Popularne znaczniki pasujące do „$1“ - tags_typesearchterm: Wpisz poszukiwane słowo - tip_addrelation: Dodaj do relacji - tip_addtag: Dodaj nowy znacznik - tip_alert: Wystąpił błąd – kliknij, aby dowiedzieć się więcej - tip_anticlockwise: Okrężna droga przeciwnie do wskazówek zegara – kliknij, aby cofnąć - tip_clockwise: Okrężna droga zgodnie ze wskazówkami zegara – kliknij, aby cofnąć - tip_direction: Kierunek drogi – kliknij aby odwrócić - tip_gps: Pokaż ścieżki GPS (G) - tip_noundo: Nie ma niczego do wycofania - tip_options: Ustaw opcje (wybierz mapę tła) - tip_photo: Ładuj zdjęcia - tip_presettype: Wybierz jaki gotowy typ ma być wyświetlany w menu. - tip_repeattag: Powtórz tagi z wcześniejszej zaznaczonej drogi (R) - tip_revertversion: Wybierz datę do powrotu do - tip_selectrelation: Dodaj do wybranej drogi - tip_splitway: Podziel drogę w zaznaczonym punkcie (X) - tip_tidy: Uporządkuj punkty na trasie (T) - tip_undo: Cofnij $1 (Z) - uploading: Przesyłanie... - uploading_deleting_pois: Usuwanie punktów POI - uploading_deleting_ways: Usuwanie dróg - uploading_poi: Przesyłanie POI $1 - uploading_poi_name: Przesyłanie punktów POI $1, $2 - uploading_relation: Przesyłanie relacji $1 - uploading_relation_name: Przesyłanie relacji $1, $2 - uploading_way: Przesyłanie drogi $1 - uploading_way_name: Przesyłanie drogi $1, $2 - warning: Uwaga! - way: Droga - "yes": Tak diff --git a/config/potlatch/locales/pms.yml b/config/potlatch/locales/pms.yml deleted file mode 100644 index 6c8431948..000000000 --- a/config/potlatch/locales/pms.yml +++ /dev/null @@ -1,6 +0,0 @@ -# Messages for Piedmontese (Piemontèis) -# Exported from translatewiki.net -# Export driver: syck -# Author: Borichèt -pms: - help_html: "\nBin ëvnù a Potlatch\nPotlatch a l'é l'editor ch'a l'é belfé dovresse për OpenStreetMap. A disegna stra, përcors, confin e a ampòrta da sò GPS arserche, imàgin da satélit o veje carte.\n\nSte pàgine d'agiut-sì a lo compagnëran për le fonsion ëd base ëd Potlatch, e a-j diran andoa trové pi d'anformassion. Ch'a sgnaca an sj'antestassion sì-sota për ancaminé.\n\nQuand ch'a l'ha finì, ch'a sgnaca mach an qualsëssìa àutr pòst an sla pàgina.\n\n\n\nElement ùtij da savèj\nCh'a còpia pa da dj'àutre carte!\n\nS'a sern 'Modifiché an direta', qualsëssìa cangiament ch'a farà a andrà ant la base ëd dàit man a man ch'a-j fa - visadì, dun-a. S'as sent pa sigur, ch'a serna 'Modifiché con salvatagi', e a andran andrinta mach quand ch'a sgnacrà 'Salvé'.\n\nQualsëssìa modìfica ch'a fa ëd sòlit a sarà mostrà an sla carta apress n'ora o doe (chèiche modìfiche a peulo pijé na sman-a). Pa tut a l'é mostrà an sla carta - a smijrìa tròp ancasinà. Ma dagià che ij dat d'OpenStreetMap a son a sorgiss lìbera, d'àutre përson-e a son lìbere ëd fé ëd carte ch'a mostro d'aspet diferent - com OpenCycleMap o Midnight Commander.\n\nCh'as visa che a l'é sia na bela carta (parèj ch'a disegna le curve për da bin) sia un diagrama (parèj ch'as sigura che le stra as ancontro a le crosiere).\n\nI l'oma parlà ëd copié nen da d'àutre carte?\n\n\nTreuva pi anformassion\nManual Potlatch\nLista ëd pòsta\nCiaciarada an linia (agiut dal viv)\npiassa ëd discussion an sla Ragnà\nComunità wiki\nCòdes sorgiss ëd Potlatch\n\n\n\nPër ancaminé\nAdess ch'a l'ha Potlatch duvert, ch'a sgnaca 'Modifiché con salvatagi' për ancaminé.\n\nParèj a l'é pront a disegné na carta. La manera pi bel fé për ancaminé a l'é ëd buté chèich pont d'anteresse an sla carta - o \"POI\". Costi-sì a peulo esse piòle, gesie, stassion feroviarie ... tut lòn ch'a veul.\n\nTiré e lassé andé\nPër fela motobin bel fé, a s-ciairërà na selession dij POI pi comun, pròpi sota soa carta. Për butene un an sla carta a basta tirelo da lì fin ant ël pòst giust an sla carta. E ch'as sagrin-a pa s'a lo buta nen ant ël pòst giust al prim colp: a peul tirelo fin ch'a l'é giust. Ch'a nòta che ël POI a l'é evidensià an giàun për fé vëdde ch'a l'é selessionà.\n\nNa vira ch'a l'ha fàit lòn, a vorërà deje un nòm a soa piòla (o gesia, o stassion). A vëdrà che na cita tabela a l'é comparìa sota. Un-a dj'intrade a dirà \"nòm\" seguì da \"(nòm ëd la sòrt ambelessì)\". Ch'a lo fasa - ch'a sgnaca col test, e ch'a anserissa ël nòm.\n\nCh'a sgnaca da n'àutra part an sla carta për desselessioné sò POI, e ël cit panel ëd tùit ij color a comparirà torna.\n\nBel fé, neh? Ch'a sgnaca 'Salva' (boton a drita) quand ch'a l'ha fàit.\nTramudesse\nPër tramudesse a n'àutra part ëd la carta, ch'a la tira mach an na zòna veuida. Potlatch a cariërà an automàtich ij dat neuv (ch'a varda an àut an sla drita).\n\nI l'avìo dije \"seurte sensa salvé', ma a peule ëdcò sgnaché 'Modifiché an linia'. S'a fa sòn, soe modìfiche a andran ant la base ëd dàit diretament, parèj a-i é pa ël boton 'Salvé'. Sòn a va bin për modìfiche leste e ciambree ëd cartografìa.\n\nPass apress\nContent ëd tut sòn? Bòn. Ch'a sgnaca 'Rilevament' sì-dzora për savèj com vnì un ver cartògraf!\n\nRilevament con un GPS\nL'ideja daré OpenStreetMap a l'é 'd fé na carta sensa ij drit ëd còpia restritiv ëd j'àutre carte. Sòn a veul dì ch'a peule pa copié da gnun-e part: a deuv andé e rilevé le stra chiel-midem. Për boneur, a l'é amusant! La manera pi belfé ëd fé sòn a l'é con un dispositiv GPS portàbil. Ch'a treuva na zòna ch'a l'é pa ancor cartografà, peui ch'a marcia o ch'a vada an biciclëtta për le stra con sò GPS anvisch. Ch'a pija nòta dij nòm ëd le stra, e ëd qualsëssìa àutra ròba anteressanta (piòle? gesie?), man man ch'a va.\n\nQuand ch'a va a ca, sò GPS a contnirà na registrassion ëd le marche ëd tùit ij pòst andoa a l'é stàit. A peul antlora carié sossì su OpenStreetMap.\n\nLa sòrt ëd GPS pi bon a l'é col ch'a registra la marca soens (minca second o doi) e ch'a l'ha na gran memòria. Un mucc dij nòsti cartògraf a deuvro Garmin portàtij o cite unità Bluetooth. A-i son dle recension detajà ëd GPS dzora nòsta wiki.\n\nCarié soa marcadura\nAdess, a deuv pijé soe marcadure da sò GPS. A peul esse che sò GPS a l'abia chèich programa, o a peul esse ch'a-j lassa copié j'archivi via USB. Dësnò, ch'a preuva GPSBabel. An tùit ij cas, l'archivi a deuv esse an formà GPX.\n\nPeui, ch'a deuvra l'etichëtta 'Marche GPS' për carié soa marcadura su OpenStreetMap. Ma sòn a l'é mach la prima part - a aparirà pa ancó an sla carta. A deuv disegné e deje un nòm a le stra chiel-midem, an dovrand la marcadura com guida.\nDovré toa trassadura\nCh'a treuva soa marcadura ant la lista dle 'Marche GPS', e ch'a sgnaca 'modifiché' pròpi lì da banda. Potlatch a partirà con sta marca carià, pi tùit j'àutri pont. A l'é pront për disegné!\n\nA peul ëdcò sgnaché sto boton-sì për vëdde le marcadure GPS ëd tuti (ma pa ij pont dël përcors) per la zòna corenta. Ch'agnaca Majùscole për vëdde mach soe marcadure.\nDovré fòto da satélit\nS'a l'ha pa un GPS, ch'as sagrin-a pa. An chèiche sità, i l'oma ëd fòto da satélit andoa a peul marché ansima, gentilment dàite da Yahoo! (mersì!). Ch'a seurta e ch'a pija nòta dij nòm ëd le stra, peui ch'a torna andré e ch'a-j dissegna.\n\nS'a s-ciàira nen la galarìa da satélit, ch'a sgnaca ël boton ëd j'opsion e ch'as sigura che 'Yahoo!' a sia selessionà. S'a-j vëd anco' pa, a podrìa esse nen disponìbil për soa sità, o ch'a deva torné andré un pòch con l'agrandiment.\n\nSu sto midem boton ëd j'opsion a trovrà chèich àutre sèrnie com na carta sensa drit ëd còpia dël Regn Unì, e OpenTopMap për jë Stat Unì. Coste a son tute selessionà përchè i podoma dovreje - ch'a còpia pa da gnun-e àutre carte o fòto aéree. (La lej dij drit d'autor a fa s-giaj.)\n\nDle vire le figure da satélit a son un pòch ëspostà da doa le stra a son. S'a treuva sòn, ch'a sgnaca lë Spassi e ch'a tira lë sfond fin ch'a l'é alineà. Le marcadure GPS a son sempe pi sicure che le fòto da satélit.\n\nDisegné dij përcors\nPër disegné na stra (o 'përcors') partend da në spassi bianch an sla carta, ch'a sgnaca mach ambelessì; peui su minca pont an sla stra. Quand ch'a l'ha finì, ch'a sgnaca doe vire o ch'a sgnaca su A cap - peui ch'a sgnaca da n'àutra part për desselessioné la stra.\n\nPër disegné na stra an partend da n'àutra stra, ch'a sgnaca an sla stra për selessionela; ij sò pontin a compariran an ross. Ch'a ten-a sgnacà Majùscole e ch'a sgnaca un dij pontin për fé parte na neuva stra da col pont. (S'a-i é gnun pontin ross a la crosiera, ch'a ten-a sgnacà Majùscule e cha selession-a andoa a na veul un!)\n\nSgnaché 'Salvé' (an bass a drita) quand ch'a l'ha finì. Ch'a salva soens, dle vire ël servent a l'èissa dij problema.\n\nCh'a së speta pa che soe modìfiche a sio mostrà dlongh an sla carta prinsipal. Normalment a-i va n'ora o doe, dle vire fin a na sman-a.\nFé dle crosiere\nA l'é pròpi amportant, quand che doe stra a s'ancrosio, che a condivido un pontin (o 'neu'). Ij pianificator d'itinerari a deuvro sòn për savèj andoa giré.\n\nPotlatch a soagna sòn, fin che a fa atension a sgnaché pròpe an sla stra ch'a l'é an camin ch'a ancrosia. Ch'a varda ij segn d'agiut: le crosiere a ven-o bleuve, ël pontador a cangia, e quand ch'a l'ha fàit, la crosiera a l'ha na sotliniadura nèira.\nTramudé e scancelé\nSòn a travaja pròpi com un a së speta. Për scancelé na crosiera, ch'a la selession-a e ch'a sgnaca Scancelé. Për scancelé na stra antrega, ch'a sgnaca Majùscole-Scancelé.\n\nPër sposté cheicòs, ch'a lo tira mach. (A dovrà gnaché e tnì sgnacà për un pòch antramentre che a tira na stra, parèj a lo farà pa për eror.)\nDisegn pi avansà\nSe doe part ëd na stra a l'han dij nòm diferent, a dovrà dividla. Ch'a sgnaca an sla stra; peui ch'a sgnaca a la mira andoa a dovrìa esse dividùa, e ch'a sgnaca le tisòire. (A peul fonde le stra an sgnacand con Contròl, o ël tast Apple dzora al Mac, ma ch'a fonda pa doe stra con nòm o sòrt diferent.)\n\nLe rotonde a son pròpi malfé disegné giuste. Ch'as sagrin-a pa - Potlatch a peul giutelo. Ch'a disegna mach ël riond, ch'as sicura che as sara su chiel midem a la fin, peui ch'a sgnaca sta plancia-sì për \"polidelo\". (A peul ëdcò dovré son për drissé le stra.)\nLeu d'anteresse\nLa prima còsa ch'a l'ha amparà a l'é com tiré-e-tramudé un leu d'anteresse. A peul ëdcò creene un sgnacand doe vire an sla carta: a-i ven në riond verd. Ma com a sa s'a l'é na piòla, na gesia o d'àutr? Ch'a sgnaca 'Etichëtté', sì-sota, për savèjlo!\n\nChe sòrt dë stra é-lo?\nNa vira ch'a l'has disegnà na stra, a dovrìa dì lòn ch'a l'é. A l'é na stra prinsipal, un senté o un rì? Col ch'a l'é sò nòm? J'é-lo dle régole speciaj (per esempi \"gnun-e bici\")?\n\nAn OpenStreetMap, a memorise sòn an dovrand 'etichëtte'. N'etichëtta a l'ha doe part, e a peule avèjne vàire ch'a veul. Për esempi, a peul gionté strà | camionàbil për dì ch'a l'é na stra prinsipal; stra | residensial për na stra an quartié residensial; o stra | senté për un senté. Se le bici a son vietà, a peul ëdcò gionté bici | nò. Peui për memorisé sò nòm, ch'a gionta name | Stra dël mërcà.\n\nJ'etichëtte an Potlatch as vëddo al fond ëd lë scren - ch'a sgnaca na stra esistenta, e a vëddrà che etichëtta ch'a l'ha. Ch'a sgnaca ël segn '+' (sota a drita) për gionté n'etichëtta neuva. Ël 'x' su minca etichëtta a la scancela.\n\nA peul etichëtté la strà antrega; pont an sla stra (a peulo esse na pòrta o un semàfor); e pont d'anteresse.\nDovré etichëtte preampostà\nPër ancaminé, Potlatch a l'ha dj'ampostassion già pronte contenente j'etichëtte pi popolar.\n\nCh'a selession-a na stra, peui ch'a sgnaca an sij sìmboj fin a che a na treuva un adat. Peui, ch'a serna l'opsion pi aproprià da la lista.\n\nSòn a ampinirà j'etichëtte. Cheidun-e a saran lassà bianche parsialment parèj a podrà anserì andrinta (për esempi) ël nòm ëd la stra e ël nùmer.\nStra a sens ùnich\nA peul vorèj gionté n'etichëtta com stra a sens ùnich | é! - ma com a dis la diression? A-i é na flecia an bass a snista ch'a mosta la diression ëd la stra, da l'inissi a la fin. Ch'a la sgnaca për virela.\nSerne le tichëtte pròprie\nËd sigura a l'é pa limità mach ai preampostà. An dovrand ël boton '+', a peul dovré tute j'etichëtte.\n\nA peul vardé che etichëtte j'àutre përson-e a deuvro su OSMdoc, e a-i é na longa lista d'etichëtte popolar su nòsta wiki ciamà Caraterìstiche dle carte. Ma costi a son mach ëd sugeriment, pa ëd régole. A l'é lìber d'anventé soe etichëtte o ëd pijeje da j'àutri.\n\nDagià che ij dat d'OpenStreetMap a son dovrà për fé tante carte diferente, minca carta a mostrërà (o 'rendrà') soa sèrnia d'etichëtte.\nRelassion\nChèiche vire j'etichëtte a son pa basta, e a deuv 'fonde' doe o pi stra. A peul esse ch'as peussa pa giré da na stra a n'àutra, o che 20 ëstra ansema a faso na stra marcà për le bici. A peul fé son con na possibilità avansà ciamà 'relassion'. Për savèjne ëd pi an sla wiki.\n\nScancelé j'eror\nCost-sì a l'é ël boton d'anulament (a peul ëdcò sgnaché Z) - a anulerà l'ùltima còsa ch'a l'ha fàit.\n\nA peul 'torné' a l'ùltima version salvà ëd na stra o d'un leu. Ch'a la selession-a, peui ch'a sgnaca sò ID (ël nùmer an bass a snista) - o ch'a sgnaca H (për stòria), a vëddrà na lista ëd tut lòn ch'a l'ha modificà, e quand. Ch'a serna cola andoa torné, e ch'a sgnaca buté andaré.\n\nS'a l'ha për asar scancelà na stra e salvà, ch'a sgnaca U (për 'disdëscancelé'). Tute le stra scancelà a saran mostrà. Ch'a serna cola ch'a veul; ch'a la dësblòca an sgnacand ël tast ross; e ch'a salva com al sòlit.\n\nPens-lo che cheidun d'àutri a l'abia fàit n'eror? Ch'a-j manda un mëssagi an pòsta eletrònica. Ch'a deuvra l'opsion dë stòria (H) për selessioné sò nòm, peui ch'a sgnaca 'Pòsta'.\n\nCh'a deuvra l'Ispetor (ant ël menu 'Avansà') për anformassion ùtij an sla stra o leu corent.\nFAQ\n Com i vëddo ij mé pont?\nIt pont as mostro mach s'a sgnaca 'modifiché' an sël nòm dla marcadura an 'Marcadure GPS'. L'archivi a deuv avèj sia pontin che registr dla marcadura andrinta - ël servent a arfuda tut lòn con mach ij pontin.\n\nPi FAQ për Potlatch e OpenStreetMap.\n\n\n\nTravajé pi an pressa\nPi a l'ha angrandì, pi dat Potlatch a deuv carié. Ch'a arduva prima dë sgnaché 'Modifiché'.\n\nCh'a gava 'Dovré piuma e pontador a man' (ant la fnestra dj'opsion) për n'andi pi àut.\n\nS'ël servent a gira pian, Ch'a torna andré. Ch'a contròla la wiki për problema conossù. Chèiche vire, com la Dumìnica 'd sèira, a son sempe carià.\n\nCh'a-j disa a Potlatch ëd memorisé ij sò ansema favorì d'etichëtte. Ch'a selession-a na stra o pont con cole etichëtte, peui ch'a sgnaca Ctrl, majùscole e un nùmer da 1 a 9. Peui, për apliché torna st'etichëtte-lì, ch'a sgnaca mach Majùscole e col nùmer. (A saran arcordà minca vira a deuvra Potlatch ansima a cost ordinator).\n\nCh'a converta soa marcadura GPS ant na stra trovandla ant la lista ëd 'Marcadure GPS', sgnacand 'Modìfiché' lì-da banda, peui selessionand la casela 'convertì'. A sarà blocà (ross) parèj a sarà pa salvà. Ch'a la modìfica prima, peui ch'a sgnaca ël tast ross për dësbloché quand a l'é pront a salvé.\n\nCò sgnaché\nTiré la carta për spostesse.\nSgnaché doe vire për creé un POI neuv.\nSgnaché na vira për ancaminé na stra neuva.\nSgnaché e tiré na stra o un POI për tramudelo.\nQuand as disegna na stra\nSgnaché doe vire o sgnaché Intra për finì ëd disegné.\nSgnaché n'àutra manera ëd fé na crosiera.\nMajùscole-sgnaché la fin ëd n'àutra stra për mës-cé.\nQuand na stra a l'é selessionà\nSgnaché un pontin për selessionelo.\nMajùscole-sgnaché an sla stra për anserì un pontin neuv.\nMajùscole-sgnaché un pontin për ancaminé na stra neuva da lì.\nContròl-sgnaché n'àutra stra për mës-cé.\n\nScurse da tastadura.\nB Gionté n'etichëtta sorgiss ëd lë sfond\nC Saré\nG Smon-e le marcadure GPS\nH Smon-e la stòria\nI Mostré l'ispetor\nJ Gionté dij pontin a dle stra ch'a s'ancrosio\nK Bloché/dësbloché la selession corenta\nL Mostré latitùdin/longitùdin corente\nM Massimisé la fnestra ëd modìfica\nP Creé na stra paralela\nR aRpete j'etichëtte\nS Salvé (sensa modifiché dal viv)\nT Rangé an na linia/un sercc\nU Torné andré (smon-e le stra scancelà)\nX Tajé na stra an doi\nZ Torné andré\n- Gavé ij pontin mach da sta stra-sì\n+ Gionté n'etichëtta neuva\n/ Selessioné n'àutra stra ch'a condivid sto pontin-sì\nScancelé Scancelé pontin\n (+Majùscole) Scancela na stra antrega\nA cap Finì ëd disegné na linia\nSpassi Pijé e tiré lë sfond\nEsc Fé pa sta modìfica-sì\n; carié torna dal servent\n0 Gavé tute j'etichëtte\n1-9 Selessioné j'etichëtte preampostà\n (+Majùscole) Selessioné j'etichëtte memorisà\n (+S/Ctrl) Memorisé j'etichëtte\n§ o ' Sicl tra le partìe dj'etichëtte\n\n" diff --git a/config/potlatch/locales/pt-BR.yml b/config/potlatch/locales/pt-BR.yml deleted file mode 100644 index 9bb20b911..000000000 --- a/config/potlatch/locales/pt-BR.yml +++ /dev/null @@ -1,243 +0,0 @@ -# Messages for Brazilian Portuguese (Português do Brasil) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: BraulioBezerra -# Author: Giro720 -# Author: Luckas Blade -# Author: Nighto -# Author: Rodrigo Avila -pt-BR: - a_poi: $1 um ponto de interesse (POI) - a_way: $1 um caminho - action_addpoint: Adicionando um nó ao fim do caminho - action_cancelchanges: Cancelando as mudanças de - action_changeway: mudanças na via - action_createparallel: criando caminhos paralelos - action_createpoi: Criando um ponto de interesse (POI) - action_deletepoint: Apagando um ponto - action_insertnode: Adicionando um nó em um caminho - action_mergeways: Mesclando dois caminhos - action_movepoi: Movendo um ponto de interesse (POI) - action_movepoint: Movendo um ponto - action_moveway: Movendo um caminho - action_pointtags: Ajustando tags (rótulos) em um ponto - action_poitags: Ajustando tags (rótulos) em um ponto de interesse (POI) - action_reverseway: Invertendo um caminho - action_revertway: invertendo um caminho - action_splitway: Dividindo um caminho - action_waytags: Ajustando tags (rótulos) em um caminho - advanced: Avançado - advanced_close: Fechar conjunto de mudanças - advanced_history: Histórico do caminho - advanced_inspector: Inspetor - advanced_maximise: Maximizar janela - advanced_minimise: Minimizar janela - advanced_parallel: Caminho paralelo - advanced_tooltip: Ações avançadas de edição - advanced_undelete: Restaurar - advice_bendy: Muito curvo para endireitar (pressione SHIFT para forçar) - advice_conflict: Conflito no servidor - você pode tentar novamente - advice_deletingpoi: Apagando Ponto de Interesse (Z para desfazer) - advice_deletingway: Excluindo caminho (Z para desfazer) - advice_microblogged: Atualizamos seu status no $1 - advice_nocommonpoint: As vias não compartilham um ponto em comum - advice_revertingpoi: Revertendo ao último Ponto de Interesse salvo (Z para desfazer) - advice_revertingway: Revertendo para o último caminho salvo (Z para desfazer) - advice_tagconflict: Tags não combinam - por favor verifique (para voltar pressione Z) - advice_toolong: Muito longo para destravar - por favor divida em vias menores - advice_uploadempty: Nada a ser enviado - advice_uploadfail: Envio parou - advice_uploadsuccess: Todos os dados foram enviados com sucesso - advice_waydragged: Via arrastada (para voltar pressione Z) - cancel: Cancelar - closechangeset: Fechando conjunto de mudanças - conflict_download: Baixar esta versão - conflict_overwrite: Sobrescrever sua versão - conflict_poichanged: Desde que você começou a editar, outra pessoa mudou o ponto $1$2. - conflict_relchanged: Desde que começou a editar, alguém mudou a relação $1$2. - conflict_visitpoi: Clique 'Ok' para mostrar o ponto. - conflict_visitway: Clique em "Ok" para mostrar o caminho. - conflict_waychanged: Desde que você começou a editar, outra pessoa mudou o caminho $1$2. - createrelation: Criar uma nova relação - custom: "Personalizado:" - delete: Apagar - deleting: Apagando - drag_pois: Arraste pontos de interesse - editinglive: Editando ao vivo - editingoffline: Editando offline - emailauthor: \n\nFavor enviar um e-mail a richard\@systemeD.net com um relatório de erro, informando o que você estava fazendo na hora. - error_anonymous: Você não pode contactar um mapeador anônimo. - error_connectionfailed: Sinto muito - a conexão ao servidor do OpenStreetMap falhou. Algumas alterações recentes não foram salvas.\n\nVocê gostaria de tentar novamente? - error_microblog_long: "O envio a $1 falhou:\nCódigo HTTP: $2\nMensagem de erro: $3\n$1 erro: $4" - error_nopoi: O ponto de interesse (POI) não foi encontrado (talvez você tenha mudado a sua posição?), por isso não posso desfazer. - error_nosharedpoint: Caminhos $1 e $2 não compartilham mais um mesmo ponto, então a divisão não pode ser desfeita. - error_noway: Caminho $1 não foi encontrado (talvez você mudou a sua posição?), por isso não posso desfazer. - error_readfailed: Desculpe - o servidor do OpenStreetMap não respondeu.\n\nGostaria de tentar de novo? - existingrelation: Adicionar a uma relação existente - findrelation: Encontrar uma relação contendo - gpxpleasewait: Favor aguardar enquanto a trilha GPX é processada. - heading_drawing: Desenhando - heading_introduction: Introdução - heading_pois: Começando - heading_quickref: Referência rápida - heading_surveying: Levantamento - heading_tagging: Marcação - heading_troubleshooting: Resolução de problemas - help: Ajuda - help_html: "Bem-vindo ao Potlatch\nPotlatch é o editor simples de usar do OpenStreetMap. Desenhe ruas, caminhos, pontos turísticos e lojas através de seu conhecimento local, trilhas GPS, imagem de satélite ou mapas antigos.\n\nEssas páginas de ajuda iram lhe mostrar o básico da utilização do Potlatch, e vão lhe indicar onde conseguir mais. Clique nos títulos acima para começar.\n\nQuando você estiver satisfeito, simplesmente clique em qualquer outro lugar da página.\n\n\n\nÉ importante saber\nNão copie de outros mapas!\n\nSe você escolher 'Editar ao vivo', as mudanças que você fizer irão para o banco de dados assim que você as desenhar - ou seja, imediatamente. Se você não estiver tão confiante, escolha 'Editar e Salvar', assim as mudanças só serão enviadas quando você pressionar 'Salvar'.\n\nQuaisquer edições que você fizer geralmente aparecem no mapa depois de uma ou duas horas (ou uma semana). Nem tudo é mostrado no mapa - senão ia virar bagunça. Devido aos dados do OpenStreetMap serem open source, outras pessoas estão livres para criar mapas mostrando diferentes aspectos - como OpenCycleMap ou Midnight Commander.\n\nLembre-se de que é um mapa bonito (então desenhe curvas bonitas) e um diagrama (então tenha certeza de que as ruas se cruzam nos cruzamentos).\n\nJá falei sobre não copiar de outros mapas?\n\n\nDescubra mais\nManual do Potlatch\nListas de email\nChat online (ajuda ao vivo)\nFórum\nWiki\nCódigo-fonte do Potlatch\n\n\n\nComeçando\nAgora que você abriu o Potlatch, clique em 'Editar e Salvar' para começar.\n\nEntão você estar pronto para desenhar o mapa. O jeito mais fácil de começar e botando alguns pontos de interesse no mapa - ou \"POIs\" (do inglês Points of Interest). Podem ser bares, igrejas, estações de trem... o que você quiser.\n\nArrastar\nPara ficar super fácil, você verá uma seleção dos pontos de interesse mais comuns, logo abaixo do mapa. Para adicionar um, basta arrastar para o lugar correto no mapa. Não se preocupe se você não acertar a posição de primeira: você pode arrastar o ponto no mapa até acertar. Note que o ponto é destacado em amarelo para você saber que ele está selecionado.\n\nAgora que você fez isso, você irá querer dar um nome para o seu bar (ou igreja, ou estação). Você verá que uma pequena tabela apareceu embaixo do mapa. Uma das entradas será \"name\" seguido de \"(type name here)\" (digite aqui). Faça isso - clique no texto, e digite o nome.\n\nClique em qualquer outro lugar do mapa para desselecionar seu ponto de interesse, e o painel colorido retorna.\n\nFácil, né? Clique em 'Salvar' (canto inferior direito) quando você tiver terminado.\nAndando por aí\nPara mover para uma parte do mapa diferente, é só arrastar uma área vazia. O Potlatch irá automaticamente carregar os novos dados (observe o canto superior direito).\n\nNós recomendamos você a usar o modo \"Editar e Salvar\", mas você também pode escolher o \"Editar ao vivo\". Se você o fizer, suas mudanças irão para o banco de dados direto, então não há botão de 'Salvar'. Isso é bom para mudanças rápidas e mapping parties.\n\nPróximos passos\nAchou legal? Ótimo. Clique em 'Explorando' (acima) para descobrir como se tornar um mapeador de verdade!\n\nExplorando com um GPS\nA ideia por trás do OpenStreetMap é criar um mapa sem o copyright restritivo de outros mapas. Isso quer dizer que você não pode copiar de qualquer outro lugar: você deve ir nas ruas e explorá-las você mesmo. E isso é bem divertido!\nA melhor maneira de fazer isso é com um GPS portátil. Encontre uma área que ainda não foi mapeada e ande ou pedale pelas ruas com o seu GPS ligado. Anote os nomes das ruas, e tudo que for interessante (bares? igrejas?) pelo caminho.\n\nQuando você chegar em casa, seu GPS terá uma trilha gravada, com as ruas em que você passou. Você pode subir este arquivo para o OpenStreetMap.\n\nO melhor tipo de GPS é um que grave o tracklog frequentemente (a cada um ou dois segundos) e tenha bastante memória. Muitos de nossos mapeadores usam GPS Garmin ou bluetooth. Eles estão detalhados no nosso wiki em GPS Reviews.\n\nSubindo sua trilha\nAgora, você precisa extrair a trilha do seu GPS. Talvez o seu GPS tenha vindo com algum programa, ou talvez ele permita copiar os arquivos via USB. Se não, você pode tentar usar o GPSBabel. De qualquer maneira, você quer um arquivo no formato GPX.\n\nEntão, use a aba 'Trilhas GPS' acima para carregar sua trilha para o OpenStreetMap. Mas este é só o primeiro passo - ele não irá aparecer no mapa ainda. Você deve desenhar e nomear as ruas, usando a trilha como guia.\nUsando sua trilha\nEncontre sua trilha carregada na lista de 'Trilhas GPS' e clique no botão 'editar' ao lado dela. O Potlatch irá abrir com essa trilha carregada e quaisquer pontos marcados. Você está pronto para desenhar!\n\nVocê também pode clicar neste botão para mostrar as trilhas GPS de todos para a área atual. Segure Shift para mostrar só as suas trilhas.\nUsando fotos de satélite\nSe você não tiver um GPS, não se preocupe. Em algumas cidades, nós temos fotos de satélite nas quais é possível traçar sobre, gentilmente fornecidas pelo Yahoo! (valeu!). Dê uma volta e anote o nome das ruas, então volte e trace as linhas.\n\nSe você não conseguir ver a imagem de satélite, clique no botão Opções e tenha certeza de que 'Yahoo!' está selecionado. Se você ainda não conseguir ver, provavelmente não está disponível para a sua cidade, ou talvez você precise diminuir um pouco o zoom.\n\nNesta mesma tela de opções você encontrará outras opções como mapas antigos do Reino Unido, e o OpenTopoMap para os Estados Unidos. Eles estão especialmente selecionados porque a sua utilização é permitida - não copie de nenhum outro mapa ou foto de satélite. (É, a lei do Copyright é uma droga.)\n\nÀs vezes as fotos de satélite estão um pouco desalinhadas de onde as ruas realmente são. Se for o caso, segure Espaço e arraste o fundo até que as linhas batam com as trilhas GPS. Sempre confie mais nas trilhas GPS do que nas fotos de satélite.\n\nDesenhando vias\nPara desenhar uma rua (ou 'via') começando num espaço em branco no mapa, simplesmente clique ali; então clique em cada ponto em que a rua faz curva ou cruza com outra. Quando você tiver terminado, dê um duplo-clique ou pressione Enter - então clique em algum lugar vazio para desselecionar a rua.\n\nPara desenhar uma via começando de outra via, clique na rua para selecioná-la; seus pontos irão aparecer em vermelho. Segure Shift e clique em um deles para começar uma nova via naquele ponto. (Se não há um ponto vermelho na junção, dê um shift-clique onde você quiser um!)\n\nClique em 'Salvar' (canto inferior direito) quando você tiver terminado. Salve com frequência, caso o servidor tenha problemas.\n\nNão espere que suas mudanças apareçam instantaneamente no mapa principal. Geralmente leva uma ou duas horas, às vezes leva uma semana.\nCriando junções\nÉ muito importante que, quando duas ruas se juntam, elas compartilhem um ponto (ou 'nó'). Planejadores de rotas usam isso para saber onde virar.\n\nO Potlatch toma conta disso desde que você clique exatamente na via que está juntando. Observe os sinais: os pontos aparecem em azul, o cursor do mouse muda, e quando você terminar, o ponto de junção terá um contorno preto.\nMovendo e apagando\nFunciona exatamente como você esperaria. Para apagar um ponto, selecione-o e pressione Delete. Para apagar toda uma via, pressione Shift-Delete.\n\nPara mover algo, simplesmente arraste. (Você terá que clicar e segurar um pouco antes de arrastar, de forma a evitar que você o faça por acidente.)\nDesenho avançado\nSe duas partes de uma via tiverem nomes diferentes, você terá que separá-los. Clique na via; então clique no ponto onde a via deveria separar e clique no ícone da tesoura. (Você pode mesclar as vias com Ctrl, ou a tecla Apple em um Mac, mas não combine duas ruas de diferentes nomes ou tipos.)\n\nRotatórias são realmente difíceis de desenhar direito. Não se preocupe - o Potlatch pode ajudar. Simplesmente desenhe o círculo de forma bruta (um triângulo está OK), tendo certeza de que ele fecha no primeiro ponto, então clique neste ícone para 'arrumar'. (Você também pode usar isto para endireitar ruas.)\nPontos de interesse\nA primeira coisa que você aprendeu foi como arrastar um ponto de interesse. Você também pode criar um dando um duplo-clique no mapa: um círculo verde aparece. Mas como dizer que ele é um bar, uma igreja ou o quê? Clique em 'Etiquetar' acima para descobrir!\n\nQue tipo de rua?\nQuando você tiver desenhado uma via, você deve dizer o que ela é. É uma auto-estrada, uma rua de pedestres ou um rio? Qual é o nome? Há alguma regra especial (por exemplo, \"proibido bicicleta\")?\n\nNo OpenStreetMap, você grava isso usando 'etiquetas' ('tags'). Uma etiqueta tem duas partes, e você pode ter quantas quiser. Por exemplo, você poderia adicionar highway | trunk para dizer que é uma auto-estrada; highway | residential para uma rua residencial; ou highway | footway para uma calçada. Se bicicletas forem proibidas, você pode adicionar bicycle | no. Para gravar o nome, adicione name | Rua do Mercado.\n\nAs etiquetas no Potlatch aparecem na parte de baixo da tela - clique numa rua que já exista, e você verá que tags ela tem. Clique no ícone '+' (canto inferior direito) para adicionar uma nova tag. O botão 'x' em cada tag a exclui.\n\nVocê pode etiquetar vias inteiras; pontos nas vias (talvez um portão ou sinal de trânsito); e pontos de interesse.\nEtiquetas pré-definidas\nPara começar, o Potlatch tem pré-definições prontas contendo as tags mais populares.\n\nSelecione uma via, então clique nos símbolos até que você encontre o mais apropriado. Então, clique na opção mais apropriada no menu.\n\nIsso irá preencher as tags. Algumas não são preenchidas para que você possa digitar (por exemplo) o nome da estrada e o seu número.\nRuas de mão-única\nVocê pode adicionar a tag oneway | yes - mas como dizer a direção? Há uma seta no canto inferior esquerdo que mostra a direção da via, do começo para o fim. Clique nela para inverter a direção.\nSuas próprias etiquetas\nÉ claro, você não está restrito às pré-definições. Usando o botão '+', você pode digitar uma tag qualquer.\n\nVocê pode ver as etiquetas que outras pessoas usam no OSMdoc, e há uma longa lista de etiquetas populares no wiki chamada Map Features. Mas elas são apenas sugestões, não regras. Você é livre para inventar suas etiquetas ou copiar de outras pessoas.\n\nComo os dados do OpenStreetMap são usados para fazer diferentes mapas, cada mapa irá mostrar (ou 'renderizar') seu próprio conjunto de etiquetas.\nRelacionamentos\nÀs vezes as etiquetas não são suficiente, e você precisa 'agrupar' duas ou mais vias. Seja uma conversão à direita que é proibida, ou 20 vias que juntas formam uma linha de ônibus. Você pode fazer isso com uma opção avançada chamada 'relacionamento'. Veja mais no wiki.\n\nDesfazendo erros\nEste é o botão de desfazer (você também pode pressionar Z) - ele irá desfazer a última coisa que você fez.\n\nVocê pode 'reverter' para uma versão previamente salva de uma via ou ponto. Selecione-a, clique no seu ID (o número no canto inferior esquerdo) - ou pressione H (de 'histórico'). Você verá uma lista de todos que a editaram, e quando. Escolha a que você deseja voltar, e clique em Reverter.\n\nSe você acidentalmente apagou uma via e salvou, pressione U (de 'undelete', 'desapagar'). Todas as vias apagadas serão mostradas. Escolha a que você quer; destrave-a clicando no cadeado; e salve como usual.\n\nAcha que alguém cometeu um engano? Envie uma mensagem amigável para ele. Use a opção Histórico (H), selecione o nome, e clique em 'Correio'.\n\nUse o Inspetor (no menu 'Avançado') para encontrar informações valorosas sobre a via ou ponto atual.\nFAQ\nComo eu vejo meus caminhos?\nCaminhos apenas são exibidos se você clicar 'editar' no nome do traço de 'Traços GPS'. O arquivo deve ter tanto caminhos quanto tracklogs - o servidor rejeita arquivos que tenham apenas Caminhos.\n\nMais FAQs para o Potlatch e o OpenStreetMap.\n\n\n\nTrabalhando mais rápido\nQuanto mais afastado o zoom estiver, mais dados o Potlatch terá que carregar. Aproxime o zoom antes de clicar em 'Editar'.\n\nDesabilite 'Apontadores caneta e mão' (na janela de opções) para aumentar a velocidade.\n\nSe o servidor estiver muito devagar, volte depois. Verifique no wiki por problemas conhecidos. Às vezes, no Domingo à noitinha, as coisas ficam um pouco sobrecarregadas..\n\nDiga ao Potlatch para memorizar os seus grupos favoritos de etiquetas. Selecione um caminho ou ponto que tenham as tags, e pressione Ctrl, Shift e um número de 1 a 9. Então, para aplicar estas etiquetas novamente, apenas pressione Shift e o número escolhido. (Ele vai se lembrar cada vez que você usar o Potlatch neste computador.)\n\nTransforme a sua trilha GPS em um caminho por encontrá-la na lista de 'Trilhas GPS', clicar em 'editar', e marque a caixa 'converter'. Ela irá ficar travada (vermelho) para que não seja salva. Edite-a primeiro, e depois clique no cadeado para destravá-la quando estiver pronto para salvar.\n\nOnde clicar\nArraste o mapa para movê-lo.\nDuplo clique para criar novo POI.\nClique para iniciar novo caminho.\nSegure e arraste um caminho ou POI para movê-lo.\nQuando desenhar um caminho\nDuplo-clique ou pressione Enter para encerrar o desenho.\nClique sobre outro caminho para fazer uma junção.\nShift-clique no final do outro caminho para mesclar.\nQuando se seleciona uma via\nClique em um ponto para selecioná-lo.\nShift-clique no caminho para inserir um novo ponto.\nShift-clique em um ponto para iniciar um novo caminho a partir dali.\nControl-clique em outro caminho para mesclar.\n\nAtalhos do teclado\nB Adiciona etiqueta de fonte do plano de fundo\nC Fechar Conjunto de mudanças\nG Mostrar trilhas GPS\nH Mostrar o histórico\nI Mostrar o inspetor\nJ Une em um ponto o cruzamento de dois caminhos\n(+Shift) Unjoin from other ways\nK Bloqueia/desbloqueia a seleção atual\nL Exibe a latitude/longitude atual\nM Maximiza a janela de edição\nP Criar caminho paralelo\nR Repetir etiquetas\nS Salvar (a menos que esteja editando ao vivo)\nT Arruma em uma linha reta ou circular\nU Desfazer exclusão (mostrando caminhos excluídos)\nX Quebra o caminho em dois\nZ Desfazer\n- Remove um ponto apenas deste caminho\n+ Adiciona nova etiqueta\n/ Seleciona outro caminho que compartilha este ponto\nDelete Remove um ponto\n (+Shift) Remove o caminho inteiro\nReturn encerra o desenho da linha\nSpace Arrastar o fundo\nEsc Aborta esta edição; recarrega dados do servidor\n0 Remove todas as etiquetas\n1-9 Seleciona etiquetas pré-gravadas\n (+Shift) Seleciona etiquetas memorizadas\n (+S/Ctrl) Memorizar etiquetas\n§ ou ` Circula entre grupos de etiquetas\n\n" - hint_drawmode: Clique para adicionar um ponto\nDuplo clique/Enter\npara finalizar a linha - hint_latlon: "lat $1\nlon $2" - hint_loading: Carregando caminhos - hint_overendpoint: Sobre o ponto final\nclique para ligar\nclique pressionando o shift para mesclar - hint_overpoint: Sobre o ponto\nclique para conectar - hint_pointselected: Ponto selecionado\n(clique no ponto pressionando o shift para\niniciar uma nova linha) - hint_saving: salvando dados - hint_saving_loading: carregando/salvando dados - inspector: Inspetor - inspector_duplicate: Duplicado de - inspector_in_ways: Nos caminhos - inspector_latlon: "Lat $1\nLon $2" - inspector_locked: Bloqueado - inspector_node_count: ($1 vezes) - inspector_not_in_any_ways: Não está em nenhuma via (POI) - inspector_unsaved: Não salvo - inspector_uploading: (enviando) - inspector_way: $1 - inspector_way_connects_to: Conecta-se com $1 caminhos - inspector_way_connects_to_principal: Liga a $1 $2 e $3 outros $4 - inspector_way_name: $1 ($2) - inspector_way_nodes: $1 nós - inspector_way_nodes_closed: $1 nós (fechado) - loading: Carregando… - login_pwd: "Senha:" - login_retry: O seu site de login não foi reconhecido. Por favor tente novamente. - login_title: Não foi possível efetuar o log in - login_uid: "Nome de usuário:" - mail: Msg. - microblog_name_identica: Identi.ca - microblog_name_twitter: Twitter - more: Mais - newchangeset: "Por favor tente de novo: Potlatch iniciará um novo conjunto de mudanças." - "no": Não - nobackground: Sem imagem de fundo - norelations: Nenhuma relação na área atual - offset_broadcanal: Canal largo - offset_choose: Escolha o deslocamento (m) - offset_dual: Pista dupla (D2) - offset_motorway: Autoestrada (D3) - offset_narrowcanal: Canal estreito - ok: Ok - openchangeset: Abrindo changeset - option_custompointers: Apontadores caneta e mão - option_external: "Lançador externo:" - option_fadebackground: Esmaecer o plano de fundo - option_layer_cycle_map: OSM - cycle map - option_layer_digitalglobe_haiti: "Haiti: DigitalGlobe" - option_layer_geoeye_gravitystorm_haiti: "Haiti: GeoEye Jan 13" - option_layer_geoeye_nypl_haiti: "Haiti: GeoEye Jan 13+" - option_layer_maplint: OSM - Maplint (erros) - option_layer_mapnik: OSM - Mapnik - option_layer_nearmap: "Austrália: NearMap" - option_layer_ooc_25k: "UK histórico: 1:25k" - option_layer_ooc_7th: "UK histórico: 7th" - option_layer_ooc_npe: "UK histórico: NPE" - option_layer_ooc_scotland: "UK histórico: Escócia" - option_layer_os_streetview: "UK: OS StreetView" - option_layer_osmarender: OSM - Osmarender - option_layer_streets_haiti: "Haiti: nomes de ruas" - option_layer_surrey_air_survey: "UK: Mapa aéreo de Surrey" - option_layer_tip: Escolha o fundo a mostrar - option_layer_yahoo: Yahoo! - option_limitways: Avisa carga de muitos dados - option_microblog_id: "Nome do microblog:" - option_microblog_pwd: "Senha do microblog:" - option_noname: Realçar estradas sem nome - option_photo: "KML da foto:" - option_thinareas: Linhas mais finas em áreas - option_thinlines: Sempre usar linhas finas - option_tiger: Destacar TIGER sem mudança - option_warnings: Mostrar avisos flutuantes - point: Ponto - preset_icon_airport: Aeroporto - preset_icon_bar: Bar - preset_icon_bus_stop: P. de ônibus - preset_icon_cafe: Café - preset_icon_cinema: Cinema - preset_icon_convenience: Conveniência - preset_icon_disaster: Edif. no Haiti - preset_icon_fast_food: Fast food - preset_icon_ferry_terminal: Term. Balsa - preset_icon_fire_station: Bombeiros - preset_icon_hospital: Hospital - preset_icon_hotel: Hotel - preset_icon_museum: Museu - preset_icon_parking: Estacionamento - preset_icon_pharmacy: Farmácia - preset_icon_place_of_worship: Templo Rel. - preset_icon_police: Delegacia - preset_icon_post_box: Cx. correio - preset_icon_pub: Pub - preset_icon_recycling: C. de reciclagem - preset_icon_restaurant: Restaurante - preset_icon_school: Escola - preset_icon_station: Est. de trem - preset_icon_supermarket: Supermercado - preset_icon_taxi: Pto. de táxi - preset_icon_telephone: Telefone - preset_icon_theatre: Teatro - preset_tip: Escolha dentre um menu de tags que descrevam $1 - prompt_addtorelation: Adicionar $1 a uma relação - prompt_changesetcomment: "Descreva as suas mudanças:" - prompt_closechangeset: fechar changeset $1 - prompt_createparallel: Criar caminho paralelo - prompt_editlive: Editar ao vivo - prompt_editsave: Editar e salvar - prompt_helpavailable: Novato? Veja a ajuda no canto inferior esquerdo. - prompt_launch: Carregar URL externa - prompt_live: No modo Ao Vivo, cada item que você altera é salvo na base de dados do OpenStreetMap instantaneamente - não é recomendado para iniciantes. Tem certeza? - prompt_manyways: Esta área contém muitos detalhes e demorará muito para carregar. Você prefere aproximar? - prompt_microblog: Enviando para $1 ($2 restantes) - prompt_revertversion: "Reverter para versão anterior:" - prompt_savechanges: Salvar alterações - prompt_taggedpoints: Alguns pontos tem etiquetas ou pertencem a uma relação. Quer realmente apagá-los? - prompt_track: Converta a sua trilha GPS para caminhos (trancados) a serem editados. - prompt_unlock: Clique para desbloquear - prompt_welcome: Bem-vindo ao OpenStreetMap! - retry: Tentar novamente - revert: Desfaz. - save: Salvar - tags_backtolist: Voltar à lista - tags_descriptions: Descrições de '$1' - tags_findatag: Encontrar uma etiqueta - tags_findtag: Etiquetas - tags_matching: Etiquetas populares que coincidem com '$1' - tags_typesearchterm: "Digite uma palavra para buscar:" - tip_addrelation: Adicionar a uma relação - tip_addtag: Adicionar um novo tag (rótulo) - tip_alert: Ocorreu um erro - clique para mais informações - tip_anticlockwise: Caminho circular no sentido anti-horário - clique para inverter - tip_clockwise: Caminho circular no sentido horário - clique para inverter - tip_direction: Direção do caminho - clique para inverter - tip_gps: Mostrar trilhas do GPS - tip_noundo: Nada para desfazer - tip_options: Configurar opções (escolha o plano de fundo do mapa) - tip_photo: Carregar fotos - tip_presettype: Escolha quais tipos predefinidos são oferecidos neste menu. - tip_repeattag: Repetir tags (rótulos) do caminho previamente selecionado (R) - tip_revertversion: Escolha a versão para reverter - tip_selectrelation: Adicionar à rota escolhida - tip_splitway: Dividir caminho no ponto selecionado - tip_tidy: Simplificar pontos no caminho (T) - tip_undo: Desfazer $1 (Z) - uploading: Enviando... - uploading_deleting_pois: Apagando POIs - uploading_deleting_ways: Apagando vias - uploading_poi: Enviando POI $1 - uploading_poi_name: Enviando POI $1, $2 - uploading_relation: Enviando relação $1 - uploading_relation_name: Enviando relação $1, $2 - uploading_way: Enviando caminho $1 - uploading_way_name: Enviando via $1, $2 - warning: Alerta! - way: Caminho - "yes": Sim diff --git a/config/potlatch/locales/pt.yml b/config/potlatch/locales/pt.yml deleted file mode 100644 index aabaae78a..000000000 --- a/config/potlatch/locales/pt.yml +++ /dev/null @@ -1,143 +0,0 @@ -# Messages for Portuguese (Português) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Crazymadlover -# Author: Giro720 -# Author: Hamilton Abreu -# Author: Luckas Blade -# Author: Malafaya -# Author: SandroHc -pt: - a_poi: $1 um POI - a_way: $1 uma via - action_addpoint: a adicionar um nó ao fim de uma via - action_cancelchanges: cancelar alterações para - action_changeway: alterações a uma via - action_createparallel: a criar vias paralelas - action_createpoi: a criar um POI - action_deletepoint: a remover um ponto - action_insertnode: a adicionar um nó a uma via - action_mergeways: a fundir duas vias - action_movepoi: a mover um POI - action_movepoint: a mover um ponto - action_moveway: a mover uma via - action_revertway: a inverter uma via - action_splitway: a separar uma via - advanced: Avançado - advanced_inspector: Inspector - advanced_maximise: Maximizar janela - advanced_minimise: Minimizar janela - advanced_parallel: Via paralela - advanced_tooltip: Acções de edição avançada - advanced_undelete: Recuperar - advice_bendy: Demasiado sinuosa para endireitar (SHIFT para forçar) - advice_deletingpoi: A remover POI (Z para desfazer) - advice_deletingway: A remover via (Z para desfazer) - advice_microblogged: Actualizado o teu $1 estado - advice_revertingpoi: A reverter para último POI gravado (Z para desfazer) - advice_revertingway: Reverter para a última edição salva (Z para desfazer) - advice_toolong: Demasiado longa para desbloquear - por favor, separe em vias mais curtas - advice_uploadempty: Nada para carregar - advice_uploadfail: Carregamento cancelado - advice_uploadsuccess: Todos os dados enviados com sucesso - cancel: Cancelar - conflict_download: Descarregar a versão deles - conflict_poichanged: Desde que começas-te a editar, alguém mudou ponto $1$2. - conflict_visitpoi: Clique 'Ok' para mostrar o ponto. - conflict_visitway: Clique em 'Ok' para mostrar. - conflict_waychanged: Desde que começas-te a editar, alguém alterou $1$2. - createrelation: Criar uma nova relação - custom: "Personalizado:" - delete: Remover - deleting: apagando - editinglive: A editar ao vivo - editingoffline: Editando offline - error_microblog_long: "Postando $1 falhado:\nCódigo HTTP: $2\nMensagem de erro: $3\n$1 erro: $4" - findrelation: Encontrar uma relação contendo - heading_introduction: Introdução - heading_pois: Primeiros passos - heading_tagging: Etiquetando - heading_troubleshooting: Resolução de problemas - help: Ajuda - help_html: "Bem-vindo ao Potlatch\nPotlatch is the easy-to-use editor for OpenStreetMap. Draw roads, paths, landmarks and shops from your GPS surveys, satellite imagery or old maps.\n\nThese help pages will take you through the basics of using Potlatch, and tell you where to find out more. Click the headings above to begin.\n\nWhen you've finished, just click anywhere else on the page.\n\n\n\nCoisas úteis a saber\nNão copie de outros mapas!\n\nIf you choose 'Edit live', any changes you make will go into the database as you draw them - like, immediately. If you're not so confident, choose 'Edit with save', and they'll only go in when you press 'Save'.\n\nAny edits you make will usually be shown on the map after an hour or two (a few things take a week). Not everything is shown on the map - it would look too messy. But because OpenStreetMap's data is open source, other people are free to make maps showing different aspects - like OpenCycleMap or Midnight Commander.\n\nRemember it's both a good-looking map (so draw pretty curves for bends) and a diagram (so make sure roads join at junctions).\n\nDid we mention about not copying from other maps?\n\n\nDescubra mais\nManual do Potlatch\nMailing lists\nOnline chat (live help)\nWeb forum\nCommunity wiki\nPotlatch source-code\n\n\n\nGetting started\nNow that you have Potlatch open, click 'Edit with save' to get started.\n\nSo you're ready to draw a map. The easiest place to start is by putting some points of interest on the map - or \"POIs\". These might be pubs, churches, railway stations... anything you like.\n\nDrag and drop\nTo make it super-easy, you'll see a selection of the most common POIs, right at the bottom of the map for you. Putting one on the map is as easy as dragging it from there onto the right place on the map. And don't worry if you don't get the position right first time: you can drag it again until it's right. Note that the POI is highlighted in yellow to show that it's selected.\n\nOnce you've done that, you'll want to give your pub (or church, or station) a name. You'll see that a little table has appeared at the bottom. One of the entries will say \"name\" followed by \"(type name here)\". Do that - click that text, and type the name.\n\nClick somewhere else on the map to deselect your POI, and the colourful little panel returns.\n\nFácil, não é? Clique 'Gravar' (fundo à direita) quando tiver terminado.\nMoving around\nTo move to a different part of the map, just drag an empty area. Potlatch will automatically load the new data (look at the top right).\n\nWe told you to 'Edit with save', but you can also click 'Edit live'. If you do this, your changes will go into the database straightaway, so there's no 'Save' button. This is good for quick changes and mapping parties.\n\nNext steps\nHappy with all of that? Great. Click 'Surveying' above to find out how to become a real mapper!\n\nSurveying with a GPS\nThe idea behind OpenStreetMap is to make a map without the restrictive copyright of other maps. This means you can't copy from elsewhere: you must go and survey the streets yourself. Fortunately, it's lots of fun!\nThe best way to do this is with a handheld GPS set. Find an area that isn't mapped yet, then walk or cycle up the streets with your GPS switched on. Note the street names, and anything else interesting (pubs? churches?) , as you go along.\n\nWhen you get home, your GPS will contain a 'tracklog' recording everywhere you've been. You can then upload this to OpenStreetMap.\n\nThe best type of GPS is one that records to the tracklog frequently (every second or two) and has a big memory. Lots of our mappers use handheld Garmins or little Bluetooth units. There are detailed GPS Reviews on our wiki.\n\nUploading your track\nNow, you need to get your track off the GPS set. Maybe your GPS came with some software, or maybe it lets you copy the files off via USB. If not, try GPSBabel. Whatever, you want the file to be in GPX format.\n\nThen use the 'GPS Traces' tab to upload your track to OpenStreetMap. But this is only the first bit - it won't appear on the map yet. You must draw and name the roads yourself, using the track as a guide.\nUsing your track\nFind your uploaded track in the 'GPS Traces' listing, and click 'edit' right next to it. Potlatch will start with this track loaded, plus any waypoints. You're ready to draw!\n\nYou can also click this button to show everyone's GPS tracks (but not waypoints) for the current area. Hold Shift to show just your tracks.\nUsing satellite photos\nIf you don't have a GPS, don't worry. In some cities, we have satellite photos you can trace over, kindly supplied by Yahoo! (thanks!). Go out and note the street names, then come back and trace over the lines.\n\nIf you don't see the satellite imagery, click the options button and make sure 'Yahoo!' is selected. If you still don't see it, it's probably not available for your city, or you might need to zoom out a bit.\n\nOn this same options button you'll find a few other choices like an out-of-copyright map of the UK, and OpenTopoMap for the US. These are all specially selected because we're allowed to use them - don't copy from anyone else's maps or aerial photos. (Copyright law sucks.)\n\nSometimes satellite pics are a bit displaced from where the roads really are. If you find this, hold Space and drag the background until it lines up. Always trust GPS tracks over satellite pics.\n\nDrawing ways\nTo draw a road (or 'way') starting at a blank space on the map, just click there; then at each point on the road in turn. When you've finished, double-click or press Enter - then click somewhere else to deselect the road.\n\nTo draw a way starting from another way, click that road to select it; its points will appear red. Hold Shift and click one of them to start a new way at that point. (If there's no red point at the junction, shift-click where you want one!)\n\nClick 'Save' (bottom right) when you're done. Save often, in case the server has problems.\n\nDon't expect your changes to show instantly on the main map. It usually takes an hour or two, sometimes up to a week.\nMaking junctions\nIt's really important that, where two roads join, they share a point (or 'node'). Route-planners use this to know where to turn.\n\nPotlatch takes care of this as long as you are careful to click exactly on the way you're joining. Look for the helpful signs: the points light up blue, the pointer changes, and when you're done, the junction point has a black outline.\nMoving and deleting\nThis works just as you'd expect it to. To delete a point, select it and press Delete. To delete a whole way, press Shift-Delete.\n\nTo move something, just drag it. (You'll have to click and hold for a short while before dragging a way, so you don't do it by accident.)\nMore advanced drawing\nIf two parts of a way have different names, you'll need to split them. Click the way; then click the point where it should be split, and click the scissors. (You can merge ways by clicking with Control, or the Apple key on a Mac, but don't merge two roads of different names or types.)\n\nRoundabouts are really hard to draw right. Don't worry - Potlatch can help. Just draw the loop roughly, making sure it joins back on itself at the end, then click this icon to 'tidy' it. (You can also use this to straighten out roads.)\nPoints of interest\nThe first thing you learned was how to drag-and-drop a point of interest. You can also create one by double-clicking on the map: a green circle appears. But how to say whether it's a pub, a church or what? Click 'Tagging' above to find out!\n\nWhat type of road is it?\nOnce you've drawn a way, you should say what it is. Is it a major road, a footpath or a river? What's its name? Are there any special rules (e.g. \"no bicycles\")?\n\nIn OpenStreetMap, you record this using 'tags'. A tag has two parts, and you can have as many as you like. For example, you could add highway | trunk to say it's a major road; highway | residential for a road on a housing estate; or highway | footway for a footpath. If bikes were banned, you could then add bicycle | no. Then to record its name, add name | Market Street.\n\nThe tags in Potlatch appear at the bottom of the screen - click an existing road, and you'll see what tags it has. Click the '+' sign (bottom right) to add a new tag. The 'x' by each tag deletes it.\n\nYou can tag whole ways; points in ways (maybe a gate or a traffic light); and points of interest.\nUsing preset tags\nTo get you started, Potlatch has ready-made presets containing the most popular tags.\n\nSelect a way, then click through the symbols until you find a suitable one. Then, choose the most appropriate option from the menu.\n\nThis will fill the tags in. Some will be left partly blank so you can type in (for example) the road name and number.\nEstradas de sentido único\nYou might want to add a tag like oneway | yes - but how do you say which direction? There's an arrow in the bottom left that shows the way's direction, from start to end. Click it to reverse.\nChoosing your own tags\nOf course, you're not restricted to just the presets. By using the '+' button, you can use any tags at all.\n\nYou can see what tags other people use at OSMdoc, and there is a long list of popular tags on our wiki called Map Features. But these are only suggestions, not rules. You are free to invent your own tags or borrow from others.\n\nBecause OpenStreetMap data is used to make many different maps, each map will show (or 'render') its own choice of tags.\nRelations\nSometimes tags aren't enough, and you need to 'group' two or more ways. Maybe a turn is banned from one road into another, or 20 ways together make up a signed cycle route. You can do this with an advanced feature called 'relations'. Find out more on the wiki.\n\nUndoing mistakes\nThis is the undo button (you can also press Z) - it will undo the last thing you did.\n\nYou can 'revert' to a previously saved version of a way or point. Select it, then click its ID (the number at the bottom left) - or press H (for 'history'). You'll see a list of everyone who's edited it, and when. Choose the one to go back to, and click Revert.\n\nIf you've accidentally deleted a way and saved it, press U (for 'undelete'). All the deleted ways will be shown. Choose the one you want; unlock it by clicking the red padlock; and save as usual.\n\nThink someone else has made a mistake? Send them a friendly message. Use the history option (H) to select their name, then click 'Mail'.\n\nUse the Inspector (in the 'Advanced' menu) for helpful information about the current way or point.\nFAQs\nHow do I see my waypoints?\nWaypoints only show up if you click 'edit' by the track name in 'GPS Traces'. The file has to have both waypoints and tracklog in it - the server rejects anything with waypoints alone.\n\nMore FAQs for Potlatch and OpenStreetMap.\n\n\n\nWorking faster\nThe further out you're zoomed, the more data Potlatch has to load. Zoom in before clicking 'Edit'.\n\nTurn off 'Use pen and hand pointers' (in the options window) for maximum speed.\n\nIf the server is running slowly, come back later. Check the wiki for known problems. Some times, like Sunday evenings, are always busy.\n\nTell Potlatch to memorise your favourite sets of tags. Select a way or point with those tags, then press Ctrl, Shift and a number from 1 to 9. Then, to apply those tags again, just press Shift and that number. (They'll be remembered every time you use Potlatch on this computer.)\n\nTurn your GPS track into a way by finding it in the 'GPS Traces' list, clicking 'edit' by it, then tick the 'convert' box. It'll be locked (red) so won't save. Edit it first, then click the red padlock to unlock when ready to save.\n\nWhat to click\nDrag the map to move around.\nDouble-click to create a new POI.\nSingle-click to start a new way.\nHold and drag a way or POI to move it.\nWhen drawing a way\nDouble-click or press Enter to finish drawing.\nClick another way to make a junction.\nShift-click the end of another way to merge.\nWhen a way is selected\nClick a point to select it.\nShift-click in the way to insert a new point.\nShift-click a point to start a new way from there.\nControl-click another way to merge.\n\nKeyboard shortcuts\nB Add background source tag\nC Close changeset\nG Show GPS tracks\nH Show history\nI Show inspector\nJ Join point to what's below ways\n(+Shift) Unjoin from other ways\nK Lock/unlock current selection\nL Show current latitude/longitude\nM Maximise editing window\nP Create parallel way\nR Repeat tags\nS Save (unless editing live)\nT Tidy into straight line/circle\nU Undelete (show deleted ways)\nX Cut way in two\nZ Undo\n- Remove point from this way only\n+ Add new tag\n/ Select another way sharing this point\nDelete Delete point\n (+Shift) Delete entire way\nReturn Finish drawing line\nSpace Hold and drag background\nEsc Abort this edit; reload from server\n0 Remove all tags\n1-9 Select preset tags\n (+Shift) Select memorised tags\n (+S/Ctrl) Memorise tags\n§ or ` Cycle between tag groups\n\n" - hint_overendpoint: sobre ponto final ($1)\nclique para unir\nshift-clique para fundir - hint_overpoint: sobre ponto ($1)\nclique para unir - hint_saving: a gravar dados - inspector: Inspector - inspector_duplicate: Duplicado de - inspector_latlon: "Lat $1\nLon $2" - inspector_locked: Bloqueado - inspector_node_count: ($1 vezes) - inspector_unsaved: Não salvo - inspector_uploading: (upload) - inspector_way_nodes: $1 nós - inspector_way_nodes_closed: $1 nós (fechado) - loading: A carregar... - login_pwd: "Palavra-chave:" - login_uid: "Nome de utilizador:" - mail: Correio - more: Mais - "no": Não - nobackground: Sem fundo - offset_motorway: Auto-estrada (D3) - ok: Ok - option_fadebackground: Esbater fundo - option_layer_nearmap: "Austrália: NearMap" - option_layer_ooc_25k: "Reino Unido histórico: 1:25k" - option_layer_streets_haiti: "Haiti: nomes de ruas" - option_thinareas: Usar linhas mais finas para as áreas - option_thinlines: Usar linhas finas em todas as escalas - option_warnings: Mostrar avisos flutuantes - point: Ponto - preset_icon_airport: Aeroporto - preset_icon_bar: Bar - preset_icon_bus_stop: Paragem autocarro - preset_icon_cafe: Café - preset_icon_cinema: Cinema - preset_icon_convenience: Loja conveniência - preset_icon_fast_food: Fast food - preset_icon_fire_station: Bombeiros - preset_icon_hospital: Hospital - preset_icon_hotel: Hotel - preset_icon_museum: Museu - preset_icon_parking: Parque de estacionamento - preset_icon_pharmacy: Farmácia - preset_icon_police: Esquadra polícia - preset_icon_recycling: Reciclagem - preset_icon_restaurant: Restaurante - preset_icon_school: Escola - preset_icon_station: Estação Ferroviária - preset_icon_supermarket: Supermercado - preset_icon_telephone: Telefone - preset_icon_theatre: Teatro - prompt_addtorelation: Adicionar $1 a uma relação - prompt_changesetcomment: "Introduza uma descrição das suas alterações:" - prompt_createparallel: Criar via paralela - prompt_editlive: Editar ao vivo - prompt_editsave: Editar com salvar - prompt_helpavailable: Novo utilizador? Ajuda disponível no canto inferior esquerdo. - prompt_launch: Abrir URL externa - prompt_revertversion: "Reverter para uma versão gravada anteriormente:" - prompt_savechanges: Gravar alterações - prompt_unlock: Cliqua para desbloquear - prompt_welcome: Bem-vindo ao OpenStreetMap! - retry: Tentar novamente - revert: Reverter - save: Gravar - tags_backtolist: Voltar à lista - tags_descriptions: Descrições de '$1' - tags_findatag: Encontrar uma etiqueta - tags_findtag: Pesquisar etiqueta - tip_addrelation: Adicionar a uma relação - tip_addtag: Adicionar uma nova etiqueta - tip_alert: Ocorreu um erro - clique para detalhes - tip_direction: Direção da via - clique para inverter - tip_noundo: Nada a desfazer - tip_photo: Carregar fotos - tip_selectrelation: Adicionar à rota escolhida - tip_tidy: Arrumar pontos na via (T) - tip_undo: Desfazer $1 (Z) - uploading: Carregando... - warning: Atenção! - way: Via - "yes": Sim diff --git a/config/potlatch/locales/ro.yml b/config/potlatch/locales/ro.yml deleted file mode 100644 index 971475342..000000000 --- a/config/potlatch/locales/ro.yml +++ /dev/null @@ -1,15 +0,0 @@ -# Messages for Romanian (Română) -# Exported from translatewiki.net -# Export driver: syck -# Author: McDutchie -ro: - action_createpoi: creare punct de interes (POI) - action_movepoi: Miscă POI - action_movepoint: Mișcă un punct - cancel: Anuleaza - hint_drawmode: click pentru a adăuga un punct\ndouble-click/Return\npentru a termina linia - hint_overendpoint: deasupra la endpoint\nclick to join\nshift-click to merge - hint_overpoint: over point\nclick to join" - hint_pointselected: Punctul selectat\n(shift-click pe punct pentru\no linie nouă) - tip_revertversion: Choose the version to revert to - tip_splitway: Choose the version to revert to diff --git a/config/potlatch/locales/ru.yml b/config/potlatch/locales/ru.yml deleted file mode 100644 index c0ca05ddd..000000000 --- a/config/potlatch/locales/ru.yml +++ /dev/null @@ -1,242 +0,0 @@ -# Messages for Russian (Русский) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Calibrator -# Author: Chilin -# Author: Ilis -# Author: Александр Сигачёв -ru: - a_poi: $1 точки интереса (POI) - a_way: $1 линию - action_addpoint: добавление точки в конец линии - action_cancelchanges: отмена изменений к - action_changeway: изменения в линии - action_createparallel: создание параллельных линий - action_createpoi: создание точки интереса (POI) - action_deletepoint: удаление точки - action_insertnode: добавление точки в линию - action_mergeways: соединение двух линий - action_movepoi: перемещение точки интереса (POI) - action_movepoint: перемещение точки - action_moveway: перемещение линии - action_pointtags: установка тегов для точки - action_poitags: установка тегов для точки интереса - action_reverseway: изменение направления линии - action_revertway: возвращение линии - action_splitway: разделение линии - action_waytags: установка тегов на линию - advanced: Меню - advanced_close: Закрыть пакет правок - advanced_history: История линии - advanced_inspector: Инспектор - advanced_maximise: Развернуть окно - advanced_minimise: Свернуть окно - advanced_parallel: Параллельная линия - advanced_tooltip: Расширенные действия по редактированию - advanced_undelete: Восстановить - advice_bendy: Сильно изогнуто (SHIFT - выпрямить) - advice_conflict: Конфликт на сервере — возможно, потребуется повторное сохранение - advice_deletingpoi: Удаление точки интереса (Z для отмены) - advice_deletingway: Удаление линии (Z для отмены) - advice_microblogged: Ваш новый статус $1 - advice_nocommonpoint: Линии не имеют общей точки - advice_revertingpoi: Возвращение к последней сохранённой точке интереса (Z для отмены) - advice_revertingway: Возвращение к последней сохранённой линии (Z для отмены) - advice_tagconflict: Теги не совпадают, пожалуйста проверьте (Z для отмены) - advice_toolong: Длина слишком велика. Пожалуйста, разделите на более короткие линии - advice_uploadempty: Нечего передать на сервер - advice_uploadfail: Передача данных на сервер остановлена - advice_uploadsuccess: Все данные успешно переданы на сервер - advice_waydragged: Линия передвинута (Z для отмены) - cancel: Отмена - closechangeset: Закрытие пакета правок - conflict_download: Загрузить чужую версию - conflict_overwrite: Записать поверх чужой версии - conflict_poichanged: После того, как вы начали редактирование, кто-то изменил точку $1$2. - conflict_relchanged: После того, как вы начали редактирование, кто-то изменил отношение $1$2. - conflict_visitpoi: Нажмите «OK», чтобы увидеть точку. - conflict_visitway: Нажмите «OK», чтобы показать линию. - conflict_waychanged: После того, как вы начали редактирование, кто-то изменил линию $1$2. - createrelation: Создать новое отношение - custom: "Особая:" - delete: Удалить - deleting: удаление - drag_pois: Перетащите объекты на карту - editinglive: Править вживую - editingoffline: Правка оффлайн - emailauthor: "\\n\\nПожалуйста, отправьте сообщение об ошибке на электронную почту: richard\\@systemeD.net, с указанием того, какие действия вы совершали." - error_anonymous: Вы не можете связаться с анонимным картографом. - error_connectionfailed: Извините, соединение с сервером OpenStreetMap разорвано. Все текущие изменения не были сохранены.\n\nПопробовать ещё раз? - error_microblog_long: "Отправка в $1 не удалась:\nКод HTTP: $2\nСообщение об ошибке: $3\n$1 ошибка: $4" - error_nopoi: Точка интереса (POI) не найдена (возможно вы отошли в сторону?), поэтому не может быть отменена. - error_nosharedpoint: Линии $1 и $2 больше не содержат общих точек, поэтому невозможно отменить разделение. - error_noway: Линия $1 не найдена (возможно вы отошли в сторону?), поэтому невозможно отменить. - error_readfailed: Извините, сервер OpenStreetMap не ответил на запрос данных.\n\nЖелаете ли попробовать ещё раз? - existingrelation: Добавить в существующее отношение - findrelation: Найти отношения, содержащие - gpxpleasewait: Пожалуйста, подождите — GPX-треки обрабатываются. - heading_drawing: Рисование - heading_introduction: Введение - heading_pois: Начало работы - heading_quickref: Краткий справочник - heading_surveying: Геодезия - heading_tagging: Установка тегов - heading_troubleshooting: Устранение проблем - help: Справка - help_html: "Добро пожаловать в Potlatch\nPotlatch — это простой в использовании редактор для OpenStreetMap. Рисуйте дороги, пути, достопримечательности и магазины, положение которых определено вами с помощью GPS, спутниковых снимков и старых карт.\n\nЭти справочные страницы помогут вам получить первое представление об основах работы с Potlatch и расскажут вам, где узнать больше об этом редакторе. Листайте страницы, нажимая на названия разделов в шапке этого справочника.\n\nКогда вы захотите закрыть справочник — щёлкните где-нибудь рядом с окном справочника.\n\n\n\nПолезные вещи, которые надо знать\nНе копируйте из других карт!\n\nЕсли вы выберете «Правка вживую», то любые изменения, которые вы сделаете, запишутся в базу, как только вы нарисуете их, то есть сразу. Если вы не уверены, выбирайте «Правка с сохранением», в этом случае изменения будут переданы на сервер только после того, как вы нажмёте «Сохранить».\n\nЛюбые правки, которые вы сделаете отобразятся на карте только через час или два (некоторые сложные только через неделю). На карте не будет отображено всё сразу, это было бы слишком запутано. Так как данные OpenStreetMap — открытый ресурс, другие люди вольны создавать специальные карты на их основе — подобно OpenCycleMap (Открытые велосипедные карты) или Midnight Commander.\n\nЗапомните их, красивая карта (чтобы рисовать плавные съезды с дорог) и диаграмма (чтобы не забывать соединять дороги на перекрёстках).\n\nМы уже сказали, что нельзя копировать с других карт?\n\n\nГде узнать больше\nРуководство по Potlatch\nСписки рассылок\nОнлайн-чат (живая помощь)\nВеб-форум\nВики сообщества\nИсходный код Potlatch\n\n\n\nНачало работы\nКак только вы откроете Potlatch, нажмите кнопку «Правка с сохранением», чтобы начать работу.\n\nИтак, вы готовы рисовать карты. Проще всего начать с установки на карте нескольких точек интереса, так называемых POI. Это могут быть кафе, церкви, ж/д станции… всё что угодно.\n\nПеретащи и поставь\nЧтобы вам было совсем просто, мы выложили самые популярные образцы POI на панель, ниже карты, которую вы редактируете. Захватите мышкой точку с нужным названием и перетащите её на карту, в соответствующее место. И не переживайте, если точка установилась не совсем на то место, где надо: вы можете поправить её положение, перетащив дальше. Обратите внимание, что POI, которые вы выбираете, выделяются жёлтым цветом.\n\nПосле того, как вы это сделаете, вам, вероятно, захочется дать название вашему кафе (церкви, станции). Вы увидите, что снизу появится маленькая табличка. В одной из строчек этой таблички будет написано «name» (название), а рядом «(type name here)» (введите здесь название). Чтобы вписать имя — щёлкните на этот текст, и впишите название.\n\nЩёлкните где-нибудь ещё на карте, чтобы снять выделение с POI, и на экране снова появится панель с разноцветными образцами POI.\n\nПросто, не правда ли? Щёлкните на «Сохранить» (внизу, справа) когда закончите.\nПеремещение\nЧтобы переместиться в другую часть карты, просто вытащите мышкой пустую область. Potlatch автоматически скачает данные с сервера (обратите внимание на индикацию процесса в правом верхнем углу).\n\nМы рекомендовали вам использовать режим «Правка с сохранением», однако вы также можете нажать «Правка вживую». В этом случае ваши изменения будут сразу сохраняться в базу данных, то есть не будет кнопки «Сохранить». Этот режим удобен для быстрых правок и mapping parties (встреч картографов).\n\nДальнейшие шаги\nВы довольны своими успехами? Прекрасно. Щёлкните на «Геодезия» в шапке, чтобы стать настоящим картографом!\n\nГеодезия с помощью GPS\nИдея OpenStreetMap — сделать карту без ограничительных авторских прав других карт. Это означает, что вы не можете копировать из других источников: вы должны пойти и обследовать улицы самостоятельно. К счастью, это Само по себе очень интересно!\nЛучший способ сделать это - воспользоваться карманным GPS-приёмником. Найдите район, который ещё не отображён, затем прогуляйтесь пешком или на велосипеде вдоль улицы включённым GPS-устройством. По пути обратите внимание на названия улиц и на что-нибудь ещё интересное (кафе, храмы).\n\nКогда вы вернётесь домой, ваше устройство GPS будет содержать «трек», показывающий ваш путь во время прогулки. Вы можете загрузить его на сервер OpenStreetMap.\n\nЛучшие устройства GPS это те, которые часто отмечают координаты (раз в две секунды) и обладают большой памятью. Многие наши картографы используют ручные автономные навигаторы Garmin или небольшие Bluetooth-устройства. Подробнее см. обзоры GPS в нашей вики.\n\nЗагрузка ваших треков\nТеперь вам нужно извлечь полученные треки из навигатора. Может быть ваш навигатор поставлялся с некоторым программным обеспечением для этого, или просто позволяет копировать файлы через USB. Если нет, ознакомьтесь с GPSBabel. В любом случае, вы должны получить файл в формате GPX.\n\nЗатем воспользуйтесь закладкой «GPS-треки», чтобы передать ваш трек на сервер OpenStreetMap. Но это только первый шаг, он ещё пока не появится на карте. Взяв этот трек, за основу, вы должны будете самостоятельно нарисовать и дать название дороге.\nИспользование вашего трека\nНайдите ваш трек в списке окна «GPS-треки» и нажмите на «править» справа от него. Откроется редактор Potlatch с загруженным треком, и, возможно, каким-либо путевыми точками. Вы готовы к картографированию!\n\nВы можете также увидеть все GPS-треки (но не точки трека) для текущего района. Удерживайте клавишу Shift, чтобы показать только ваши треки.\nИспользование спутниковых снимков\nЕсли у вас нет GPS, не расстраивайтесь. Имеются спутниковые снимки некоторых городов, поверх которых вы можете рисовать карту. Они любезно предоставлены Yahoo! (спасибо!). Выйдите, запишите названия улиц, затем вернитесь и рисуйте карту поверх спутникового снимка.\n\nЕсли вы не видите подложку со спутниковым снимком, нажмите на кнопку «Задание настроек» и переключите выбор на «Yahoo!». Если вы всё рано не видите его, это значит что для вашей местности может вообще не быть снимка, или требуется изменить масштаб.\n\nПод той же самой кнопкой вы найдёте другие варианты выбора карт, например, старые карты Великобритании, карту OpenTopoMap для США. Мы специально подобрали для вас карты, которые можно использовать. Пожалуйста, не копируйте информацию с других карт или снимков. (Таковы законы об авторских правах.)\n\nНекоторые спутниковые снимки немного сдвинуты от их реального положения. Если вы это обнаружите, то, удерживая нажатой клавишу ПРОБЕЛ, перетащите мышкой подложку на правильное место. Всегда доверяйте больше GPS-трекам, чем спутниковым снимкам.\n\nРисование линий\nЧтобы нарисовать дорогу (или «линию») начните с пустого места на карте, просто щёлкните туда; затем щёлкайте на каждом повороте дороги. Когда вы закончите, дважды щёлкните или нажмите клавишу Enter — затем щёлкните где-нибудь ещё, чтобы убрать выделение с нарисованной вами дороги.\n\nЧтобы нарисовать линию, начинающуюся от другой линии, щёлкните, чтобы выделить линию, от которой будете рисовать; её точки покраснеют. Удерживая Shift, щёлкните на одну из них и начните рисовать новую линию. (Если в том месте, от которого вы хотите начать рисовать нет точки, щёлкните, удерживая Shift, на середину сегмента исходной линии!)\n\nЩёлкните на «Сохранить» (справа внизу), когда закончите. Сохраняйте чаще, если на сервере наблюдаются проблемы.\n\nНе ожидайте сразу увидеть ваши изменения в режиме просмотра карты. Обычно должно пройти час или два, а иногда и неделя.\nСоздание соединений\nНа самом деле, очень важно, чтобы дороги в месте соединения имели общую точку. Планировщики маршрутов используют её, чтобы рассчитать место поворота.\n\nPotlatch следит за тем, насколько вы аккуратны, и действительно ли соединяете линии. Он подсказывает вам, окрашивая точки в разные цвета: предлагаемые к соединению точки подсвечены синим, при наведении на линию или точку линии курсор меняет вид, а когда вы соедините, у точки соединения появятся чёрные края.\nПеретаскивание и удаление\nЭто может пригодиться, когда вы обнаружили лишний объект. Чтобы удалить точку, просто выделите её и нажмите на клавишу Delete. Чтобы удалить всю линию, к которой принадлежит точка, нажмите Shift-Delete.\n\nЧтобы что-то перетащить на другое место, просто тащите его мышкой. (Вы должны щёлкнуть и удерживать некоторое время, прежде чем перетаскивать, так что вы не сделаете это случайно.)\nБолее продвинутое рисование\nЕсли две части одной линии должны иметь разные названия, вам надо будет разрезать линию. Щёлкните на линию; затем щёлкните на точку, в которой надо разрезать, и щёлкните на ножницы. (Вы можете проводить слияние линии, щёлкая кнопкой мышкой с нажатой клавишей Ctrl, но не сможете провести слияние двух дорог с различными названиями или типами.)\n\nНепросто нарисовать идеально ровную линию или круг. Не беспокойтесь, Potlatch может помочь. Просто нарисуйте грубо окружность, убедитесь, что концы линии соединены (окружность замкнута), затем щёлкните на эту пиктограмму, чтобы подравнять её. (Вы можете использовать эту возможность чтобы спрямлять дороги.)\nТочки интереса (POI)\nПервое, с чем вы познакомились, было создание точек интереса POI (point of interest). Вы можете также создавать точки интереса, сделав двойной щелчок на карте, при этом появится зелёный кружок. Но как указать, что это кафе, а не церковь? Щёлкните на раздел «Установка тегов» в шапке этого справочника!\n\nЧто такое тип дороги?\nКак только вы нарисуете линию, вы должны указать что это такое. Может это автомобильная дорога, тропинка или река? Как она называется? Действуют ли на ней какие-либо специальные правила (например, запрет велосипедного движения)?\n\nВ OpenStreetMap, вы записываете это с помощью «тегов». Тег имеет две части, и тегов можно ставить сколько угодно. Например, вы можете добавить highway | trunk чтобы сказать, что это основная дорога; highway | residential для дороги, позволяющей подъехать к дому; или highway | footway для тротуара. Если велосипедное движение запрещено, вы можете добавить тег bicycle | no. А, чтобы указать название, добавьте тег name | Проспект Мира.\n\nТеги в Potlatch отображаются внизу экрана — щёлкните на существующую дорогу, и вы увидите какие у неё теги. Щёлкните на знак «+» (внизу, справа), чтобы добавить новый тег. Кнопочка «x» удаляет тег.\n\nВы можете помечать как линии целиком, так и отдельные точки в линии (например, ворота или светофор), а также точки интереса (POI).\nИспользование заготовок тегов\nВ Potlatch имеются наборы, содержащие наиболее используемые теги.\n\nВыделите линию, затем прощёлкайте по пиктограммам, пока не появится нужный символ. Выберите подходящую опцию из меню.\n\nТаким образом, вы создадите прикреплённый к линии тег. Что-то в параметрах тега окажется незаполненным, например, вы сможете ввести название дороги и её номер.\nДороги с односторонним движением\nВозможно, вы захотите добавить тег oneway | yes, но как указать направление движения? Обратите внимание на стрелочку внизу слева, она указывает направление движения. Щёлкните по ней, чтобы изменить направление.\nНазначение ваших собственных тегов\nКонечно же, вы не ограничены в выборе тегов только встроенным в программу набором. Используя кнопку «+», вы можете задать любой тег, какой только захотите.\n\nВ OSMdoc вы можете посмотреть, какие теги и как часто, используют другие. Имеется также описания популярных тегов в вики, так называемые, Возможности карты. Но это всего лишь рекомендации, а не правила. Вы вольны изобретать собственные теги или заимствовать их у других.\n\nТак как данные OpenStreetMap используются в самых разных картах, каждая карта показывает (или «отрисовывает») теги по-своему.\nОтношения\nИногда простых тегов недостаточно, и вам необходимо «сгруппировать» две или более линии. Может быть, надо запретить поворот с одной дороги на другую, или 20 соединённых линий образуют велосипедный маршрут. Вы можете сделать это с помощью продвинутой функции, называемой «отношения». Подробнее см. в вики.\n\nОткат ошибок\nКнопка отмены (вы можете также нажать Z) приводит к отмене последнего совершённого вами действия.\n\nВы можете «вернуться» к предыдущей сохранённой версии линии или точки. Выделите её, затем щёлкните на её ID (длинное число внизу, слева от окна редактирования) или нажмите H (от History). Вы увидите раскрывающийся список всех, кто и когда правил этот объект. Выберите из списка, к какому варианту вы хотите вернуться, а затем нажмите кнопку «Вернуть».\n\nЕсли вы случайно удалили линию, а затем сохранили результат, нажмите U (от Undelete). Будут показаны все удалённые линии. Выберите ту, которая вам нужна, разблокируйте её, щёлкнув на красный замочек и сохраните результат обычным способом.\n\nВы заметили, что кто-то сделал ошибку? Отправьте ему дружелюбное письмо. Просмотрите историю объекта (H), найдите в списке его имя, затем нажмите на кнопку «Письмо».\n\nИспользуйте Инспектор (в расширенном меню) для просмотра дополнительных сведений о точке или линии.\nЧаВо (частые вопросы)\nКак мне увидеть мои путевые точки?\nПутевые точки можно увидеть только, если нажать «Править» рядом с названием трека в закладке «GPS-треки». Файл должен содержать не только точки, но и трек внутри — сервер отказывается принимать файлы только с одними путевыми точками.\n\nДругие часто задаваемые вопросы и ответы о Potlatch и OpenStreetMap.\n\n\n\nУскорение работы\nЧем больше вы отдаляете карту, тем больше данных скачивает Potlatch. Приблизьте карту, прежде чем нажать «Правка».\n\nДля увеличения скорости уберите отметку «Включить курсоры пера и руки» в окне настроек.\n\nЕсли сервер работает медленно, сделайте перерыв и продолжите работу позже. Посмотрите описание проблем в вики. Часто воскресными вечерами сервер бывает сильно занят.\n\nСкажите Potlatch, чтобы он запоминал ваши любимые наборы тегов. Выделите линию или точку с такими тегами, затем, удерживая нажатыми клавиши Ctrl и Shift, нажмите цифровую клавишу от 1 до 9. Затем, чтобы назначить эти теги снова, просто нажмите Shift и эту цифру. (Они будут вспомнены всякий раз, когда вы будите работать с Potlatch на этом компьютере.)\n\nПревратите ваш GPS-трек в линию, найдя его в списке GPS-треков, щёлкнув на ссылку «править» относящейся к этому треку, затем щёлкните на элемент «Преобразовать». Трек будет заблокирован (показан красным) и не будет сохраняться. Отредактируйте его, затем щёлкните на замочек, чтобы разблокировать созранение.\n\nЧто нажимать\nДвигайте карту, чтобы осмотреть окрестности.\nДвойной щелчок — создать новую POI.\nОдинарный щелчок — начать новую линию.\nУдерживать и тащить линию или POI — передвинуть объект.\nКогда рисуете линию\nДвойной щелчок или нажатие Enter — закончить рисование.\nЩелчок на другой линии создаст перекрёсток.\nShift-щелчок на конце другой линии — объединить.\nКогда выделена линия\nЩелчок на точке — выделить её.\nShift-щелчок на линии — вставить новую точку.\nShift-щелчок на точке — начать от неё новую линию.\nCtrl-щелчок на другой линии — объединить.\n\nКлавиатурные сокращения\nB — добавить тег источника подложки\nC — закрыть пакет правок\nG — показать GPS-треки\nH — показать историю\nI — показать инспектор\nJ — объединить точки на пересекающихся линиях\n(+Shift) Unjoin from other ways\nK — запереть/отпереть выделение\nL — показать текущую широту/долготу\nM — развернуть окно редактирования\nP — создать параллельную линию\nR — повторить теги\nS — сохранить (если не «правка вживую»)\nT — сгладить в прямую линию/окружность\nU — восстановить (показать удалённые линии)\nX — разрезать линию на две\nZ — отменить\n- — удалить точку только из этой линии\n+ — добавить новый тег\n/ — выбрать другую линию для общей точки\nDelete — удалить точку\n (+Shift) — удалить всю линию\nEnter — закончить рисование линии\nПробел — удерживая, можно передвинуть фон\nEsc — отменить эту правку; обновить с сервера\n0 — удалить все теги\n1-9 — выбрать заготовку тегов\n (+Shift) — выбрать запомненные теги\n (+Shift/Ctrl) — запомнить теги\n§ или ` — переключение между группами тегов\n\n" - hint_drawmode: нажмите для добавления точки,\nдвойной щелчок или Enter\nчтобы закончить линию - hint_latlon: "шир $1\nдол $2" - hint_loading: загрузка данных - hint_overendpoint: над конечной точкой\nclick для соединения\nshift-click для слияния - hint_overpoint: над точкой ($1)\nнажмите для соединения - hint_pointselected: точка выбрана\n(нажмите с Shift на точку\nчтобы начать новую линию) - hint_saving: сохранение данных - hint_saving_loading: загрузка / сохранение данных - inspector: Просмотр карты - inspector_duplicate: Дублирование объекта - inspector_in_ways: В линиях - inspector_latlon: "Шир $1\nДол $2" - inspector_locked: Заблокировано - inspector_node_count: ($1 шт.) - inspector_not_in_any_ways: Нет ни в одной линии (POI) - inspector_unsaved: Не сохранено - inspector_uploading: (передача на сервер) - inspector_way: $1 - inspector_way_connects_to: Соединено с $1 линиями - inspector_way_connects_to_principal: Соединяется с $1 $2 и $3 другими $4 - inspector_way_name: $1 ($2) - inspector_way_nodes: точек ($1 шт.) - inspector_way_nodes_closed: $1 точек (замкнуто) - loading: Загрузка… - login_pwd: "Пароль:" - login_retry: Ваш логин с сайта не был распознан. Пожалуйста, попробуйте ещё раз. - login_title: Не удаётся войти - login_uid: "Имя пользователя:" - mail: Письмо - microblog_name_identica: Identi.ca - microblog_name_twitter: Twitter - more: Ещё - newchangeset: \nПожалуйста, повторите попытку. Potlatch начнёт новый пакет правок. - "no": Нет - nobackground: Без подложки - norelations: Нет отношений в текущей области - offset_broadcanal: Набережная широкого канала - offset_choose: Выбор смещения (m) - offset_dual: Шоссе с разделительной полосой (D2) - offset_motorway: Автомагистраль (D3) - offset_narrowcanal: Набережная узкого канала - ok: OK - openchangeset: Открытие пакета правок - option_custompointers: Включить курсоры пера и руки - option_external: "Внешний запуск:" - option_fadebackground: Светлый фон - option_layer_cycle_map: OSM - для велосипедистов - option_layer_digitalglobe_haiti: "Гаити: DigitalGlobe" - option_layer_geoeye_gravitystorm_haiti: "Гаити: GeoEye янв 13" - option_layer_geoeye_nypl_haiti: "Гаити: GeoEye янв 13+" - option_layer_maplint: OSM - Maplint (ошибки) - option_layer_mapnik: OSM - Mapnik - option_layer_nearmap: "Австралия: NearMap" - option_layer_ooc_25k: "UK historic: 1:25k" - option_layer_ooc_7th: "UK historic: 7th" - option_layer_ooc_npe: "UK historic: NPE" - option_layer_ooc_scotland: "UK historic: Scotland" - option_layer_os_streetview: "UK: OS StreetView" - option_layer_osmarender: OSM - Osmarender - option_layer_streets_haiti: "Гаити: названия улиц" - option_layer_surrey_air_survey: "UK: Surrey Air Survey" - option_layer_tip: Выберите фон - option_layer_yahoo: Yahoo! - option_limitways: Предупрежд. когда много данных - option_microblog_id: "Имя микроблога:" - option_microblog_pwd: "Пароль микроблога:" - option_noname: Выделять дороги без названий - option_photo: "Фото KML:" - option_thinareas: Тонкие линии для полигонов - option_thinlines: Тонкие линии на всех масштабах - option_tiger: Выделять неизменённые TIGER - option_warnings: Всплывающие предупреждения - point: Точка - preset_icon_airport: Аэропорт - preset_icon_bar: Бар - preset_icon_bus_stop: Автобусная остановка - preset_icon_cafe: Кафе - preset_icon_cinema: Кинотеатр - preset_icon_convenience: Минимаркет - preset_icon_disaster: Развалины от землетрясения - preset_icon_fast_food: Фастфуд - preset_icon_ferry_terminal: Паром - preset_icon_fire_station: Пожарная часть - preset_icon_hospital: Больница - preset_icon_hotel: Гостиница - preset_icon_museum: Музей - preset_icon_parking: Стоянка - preset_icon_pharmacy: Аптека - preset_icon_place_of_worship: Место поклонения - preset_icon_police: Полицейский участок - preset_icon_post_box: Почтовый ящик - preset_icon_pub: Пивная - preset_icon_recycling: Мусорный контейнер - preset_icon_restaurant: Ресторан - preset_icon_school: Школа - preset_icon_station: ж/д станция - preset_icon_supermarket: Супермаркет - preset_icon_taxi: Стоянка такси - preset_icon_telephone: Телефон - preset_icon_theatre: Театр - preset_tip: Выберите из меню готовых тегов, описанном в $1 - prompt_addtorelation: Добавить $1 в отношение - prompt_changesetcomment: "Опишите ваши изменения:" - prompt_closechangeset: Закрытие пакета правок $1 - prompt_createparallel: Создание параллельной линии - prompt_editlive: Правка вживую - prompt_editsave: Правка с сохранением - prompt_helpavailable: Вы новичок? Воспользуйтесь кнопкой «Справка». - prompt_launch: Перейти по внешней ссылке - prompt_live: При правке вживую, каждый элемент, который вы изменяете, сохраняется в базу данных OpenStreetMap мгновенно. Для начинающих, этот режим не рекомендуется. Вы уверены? - prompt_manyways: Этот участок содержит много элементов и потому будет долго загружаться с сервера. Может лучше приблизиться? - prompt_microblog: Отправить в $1 (осталось $2) - prompt_revertversion: "Вернуться к ранее сохранённой версии:" - prompt_savechanges: Сохранение изменений - prompt_taggedpoints: Некоторые точки данной линии содержат теги или входят в отношения. Действительно удалить? - prompt_track: Преобразовать GPS-трек в линии - prompt_unlock: Нажмите, чтобы разблокировать - prompt_welcome: Добро пожаловать в OpenStreetMap! - retry: Повторить - revert: Вернуть - save: Сохранить - tags_backtolist: Вернуться к списку - tags_descriptions: Описание «$1» - tags_findatag: Найти тег - tags_findtag: Найти тег - tags_matching: Популярные теги, соответствующие «$1» - tags_typesearchterm: "Введите слово для поиска:" - tip_addrelation: Добавить отношение - tip_addtag: Добавить новый тег - tip_alert: Произошла ошибка — нажмите для получения подробностей - tip_anticlockwise: Замкнутая линия против часовой стрелки — изменить на противоположное - tip_clockwise: Замкнутая линия по часовой стрелке — изменить на противоположное - tip_direction: Направление линии — изменить на противоположное - tip_gps: Показать GPS-треки (G) - tip_noundo: Нечего отменять - tip_options: Задание настроек (выбор карты-подложки) - tip_photo: Загрузка фотографий - tip_presettype: Выберите, какой набор меток отображать в меню. - tip_repeattag: Повторить теги с предыдущей выбранной линии (R) - tip_revertversion: Выберите версию для восстановления - tip_selectrelation: Добавить в выбранный маршрут - tip_splitway: Разделить линию в текущей точке (X) - tip_tidy: Убрать точки в линии (T) - tip_undo: Отменить $1 (Z) - uploading: Передача данных на сервер… - uploading_deleting_pois: Удаление POI - uploading_deleting_ways: Удаление линий - uploading_poi: Передача на сервер POI $1 - uploading_poi_name: Передача на сервер POI $1, $2 - uploading_relation: Передача отношения $1 на сервер - uploading_relation_name: Передача на сервер отношения $1, $2 - uploading_way: Передача на сервер линии $1 - uploading_way_name: Передача на сервер линии $1, $2 - warning: Предупреждение! - way: Линия - "yes": Да diff --git a/config/potlatch/locales/rue.yml b/config/potlatch/locales/rue.yml deleted file mode 100644 index b38cc0fe2..000000000 --- a/config/potlatch/locales/rue.yml +++ /dev/null @@ -1,184 +0,0 @@ -# Messages for Rusyn (Русиньскый) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Gazeb -rue: - a_poi: $1 обєкту (POI) - a_way: $1 лінію - action_addpoint: придаваня точкы на конець лінії - action_cancelchanges: зрушіня змін до - action_changeway: зміны в лінії - action_createpoi: створїня обєкту (POI) - action_insertnode: придаваня узла до лінії - action_mergeways: злучіня двох ліній - action_movepoi: пересуваня обєкту (POI) - action_movepoint: пересуваня точкы - action_moveway: пересуваня лінії - action_pointtags: наставлїня таґів на точку - action_poitags: наставлїня таґів на обєкт (POI) - action_reverseway: зміна напрямкы лінії - action_revertway: навернутя лінії - action_waytags: наставлїня таґів на лінію - advanced: Росшырене - advanced_close: Заперти саду змін - advanced_history: Історія лінії - advanced_inspector: Іншпектор - advanced_maximise: Максімалізовати окно - advanced_minimise: Мінімалізовати окно - advanced_parallel: Паралелна лінія - advanced_tooltip: Росшырены дїї з едітованя - advanced_undelete: Обновити - advice_deletingpoi: Вымазаня обєкту (POI) (Z про зрушіня) - advice_deletingway: Вымазаня лінії (Z про зрушіня) - advice_microblogged: Обновленый ваш статус $1 - advice_revertingpoi: Навернутя до послїднёго уложеного об’єкту (POI) (Z про назад) - advice_revertingway: Навернутя до послїднёй уложеной лінії (Z про назад) - advice_toolong: Дуже довге про одомкнутя - просиме роздїльте до куртшых ліній - advice_uploadsuccess: Вшыткы дата успішно награты на сервер - cancel: Зрушыти - closechangeset: Заперти саду змін - conflict_download: Скачати чуджу верзію - conflict_poichanged: Потім, як сьте зачали едітованя, хтось змінив точку $1$2. - conflict_relchanged: Потім, як сьте зачали едітованя, хтось змінив звязок $1$2. - conflict_visitpoi: Стисните 'ОК', про вказаня точкы. - conflict_visitway: Стисните 'ОК', про вказаня лінії. - conflict_waychanged: Потім, як сьте зачали едітованя, хтось змінив лінію $1$2. - createrelation: Створити новый звязок - custom: "Шпеціалный:" - delete: Вымазати - editinglive: Едітованя нажыво - error_connectionfailed: "Перебачте - споїня з OpenStreetMap сервером розорване. Вашы зміны не могли быти уложены.\n\nСпробуйте уложыти зміны зясь?" - error_microblog_long: "Посыланя до $1 неможне:\nHTTP код: $2\nХыбове повідомлїня: $3\n$1 жыба: $4" - error_nopoi: Обєкт (POI) ся не нашов (може сьте посунули мапу?) — не дасть ся вернути назад. - error_nosharedpoint: Лінії $1 і $2 в сучасности не мають сполочну точку, также ся не можу вернути назад. - error_noway: "\nЛінія $1 ся не нашла (може сьте посунули мапу?) — не дасть ся вернути назад." - error_readfailed: Перебачте - сервер OpenStreetMap не одповідать на запросы про даня дат.\n\nСпробовати іщі раз? - findrelation: Найти звязкы што обсягують - gpxpleasewait: "Почекайте просиме: Зпрацуєме GPX-треку." - heading_drawing: Креслїня - heading_introduction: Вступ - heading_surveying: Огляд - heading_tagging: Становлїня значок - heading_troubleshooting: Рїшіня проблему - help: Поміч - hint_drawmode: придайте точку кликнутём\nдвойклик/Enter\nукончіть лінію - hint_latlon: "шыр $1\nдов $2" - hint_loading: начітаня дат - hint_overpoint: над точков ($1)\nкликнутём лінію напоїте - hint_pointselected: точка выбрана\n(Shift-ЛК на точці\nзачне нову лінію) - hint_saving: уложіня дат - hint_saving_loading: награваня/укладаня дат - inspector: Іншпектор - inspector_duplicate: Дуплікат - inspector_in_ways: В лініях - inspector_latlon: "Шыр $1\nДов $2" - inspector_locked: Замкнуто - inspector_node_count: ($1 раз) - inspector_unsaved: Неуложене - inspector_uploading: (награваня) - inspector_way_connects_to_principal: Споює з $1 $2 і $3 іншыма $4 - inspector_way_nodes: $1 узлы - inspector_way_nodes_closed: $1 точок (замкнуто) - loading: Награваня... - login_pwd: "Гесло:" - login_retry: Ваше мено хоснователя не было розознане, Спробуйте іщі раз. - login_title: Не годен войти - login_uid: "Мено хоснователя:" - mail: Е.пошта - more: Іщі - newchangeset: "Спробуйте знову: Potlatch зачне новый сет змін." - "no": Нїт - nobackground: Без позадя - offset_broadcanal: Набережна шырокого каналу - offset_choose: Выбер офсету (м) - offset_motorway: Автомаґістрала (D3) - offset_narrowcanal: Набережна узкого каналу - ok: Най буде - openchangeset: Отворям саду змін - option_external: "Вонкашнє спущіня:" - option_layer_cycle_map: OSM — цікло-мапа - option_layer_maplint: OSM — Maplint (хыбы) - option_layer_nearmap: "Австралія: NearMap" - option_layer_ooc_25k: "В.БРІТАНІЯ істор.: 1:25k" - option_layer_ooc_7th: "В.БРІТАНІЯ істор.: 1:7000" - option_layer_ooc_npe: "В.БРІТАНІЯ істор.: NPE" - option_layer_ooc_scotland: "В.БРІТАНІЯ істор.: Шотландія" - option_layer_os_streetview: "В.БРІТАНІЯ: OS StreetView" - option_layer_streets_haiti: "Гаїті: назвы уліць" - option_layer_surrey_air_survey: "UK: Surrey Air Survey" - option_layer_tip: Выберте позадя - option_noname: Звыразнити дорогы без назвы - option_photo: "Фото KML:" - option_thinareas: Тонкы лінії про поліґоны - option_thinlines: Тонкы лінії у вшыткых мірках мап - option_tiger: Вказати незміненый TIGER - option_warnings: Вказати плаваючі варованя - point: Точка - preset_icon_airport: Летїско - preset_icon_bar: Бар - preset_icon_bus_stop: Автобусова заставка - preset_icon_cafe: Кафе - preset_icon_cinema: Кіно - preset_icon_disaster: Будова на Гаїті - preset_icon_fast_food: Швыдка страва - preset_icon_ferry_terminal: Паром - preset_icon_fire_station: Пожарна станіця - preset_icon_hospital: Шпыталь - preset_icon_hotel: Готел - preset_icon_museum: Музей - preset_icon_parking: Паркованя - preset_icon_pharmacy: Лїкарня - preset_icon_police: Поліція - preset_icon_post_box: Поштова схранка - preset_icon_pub: Корчма - preset_icon_recycling: Кош на смітя - preset_icon_restaurant: Рештаврація - preset_icon_school: Школа - preset_icon_station: Желїзнічна станіця - preset_icon_supermarket: Супермаркет - preset_icon_taxi: Таксі - preset_icon_telephone: Телефон - preset_icon_theatre: Театр - preset_tip: Выберте з меню шаблонів теаів, пописанім в $1 - prompt_addtorelation: Придати $1 до звязку - prompt_changesetcomment: "Опиште вашы зміны:" - prompt_closechangeset: Заперти саду змін $1 - prompt_createparallel: Створїня паралелной лінії - prompt_editlive: Едітованя нажыво - prompt_editsave: Едітованя з улочінём - prompt_helpavailable: Новый хоснователь? Поміч найдете вправо долов. - prompt_launch: Отворити екстерну URL - prompt_manyways: Тота область є дуже подробна і буде довго єй награвати. Преферуєте приближыти єй? - prompt_revertversion: "Вернути ся ку скоре уложеній верзії:" - prompt_savechanges: Уложыти зміны - prompt_taggedpoints: Дакоры точкы на тій лінії мають таґы. Справды змазати? - prompt_welcome: Вітайте на OpenStreetMap! - retry: Повтор - revert: Вернути назад - save: Уложыти - tags_backtolist: Назад на список - tags_descriptions: Опис '$1' - tags_findatag: Найти таґ - tags_findtag: Найти таґ - tags_matching: Популарны таґы згодны з "$1" - tip_addrelation: Придати до звязку - tip_anticlockwise: Проти дразї годіновой ручкы (кликнутём зміните напрямку) - tip_clockwise: По дразї годіновой ручкы (кликнутём зміните напрямку) - tip_direction: Напрямок лінії — змінити на протилежный - tip_gps: Указати GPS-стопы (G) - tip_options: Можности (выберте собі мапу про позадя) - tip_photo: Награти фото - tip_presettype: Звольте якы тіпы шаблон указовати в меню. - tip_repeattag: Наставити таґы передтым выбраной лінії(R) - tip_splitway: Розділити лінію у выбраній точцї (X) - tip_tidy: Вырівнати точкы у лінії (Т) - tip_undo: "Назад: $1 (Z)" - uploading: Награваня... - uploading_deleting_pois: Змазаня (POI) - uploading_deleting_ways: Змазаня ліній - uploading_poi: Награваня (POI) $1 - uploading_poi_name: Награваня (POI) $1, $2 - uploading_way_name: Награваня лінії $1, $2 - warning: Позір! - way: Лінія - "yes": Гей diff --git a/config/potlatch/locales/sk.yml b/config/potlatch/locales/sk.yml deleted file mode 100644 index 2d019791e..000000000 --- a/config/potlatch/locales/sk.yml +++ /dev/null @@ -1,212 +0,0 @@ -# Messages for Slovak (Slovenčina) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Lesny skriatok -# Author: Vladolc -sk: - a_poi: $1 bod záujmu( POI) - a_way: $1 cesta - action_addpoint: pridanie bodu na koniec cesty - action_cancelchanges: zrušovacie zmeny pre - action_changeway: zmeny na ceste - action_createparallel: vytváranie rovnobežných ciest - action_createpoi: vytváranie bodov záujmu (POI) - action_deletepoint: vymazávanie bodu - action_insertnode: vkladanie bodu do cesty - action_mergeways: zlúčenie dvoch ciest - action_movepoi: posúvanie bodov záujmu (POI) - action_movepoint: presúvanie bodu - action_moveway: presúvanie cesty - action_pointtags: nastavenie tagov na bode - action_poitags: nastaviť tagy na POI - action_reverseway: otočenie smeru cesty - action_revertway: otočiť smer cesty - action_splitway: rozdelenie cesty - action_waytags: nastavenie tagov cesty - advanced: Pokročilé - advanced_close: Zavrieť súbor zmien - advanced_history: Priebeh cesty - advanced_inspector: Kontrola - advanced_maximise: Maximalizovať okno - advanced_minimise: Minimalizovať okno - advanced_parallel: Rovnobežná cesta - advanced_tooltip: Pokročilá úprava - advanced_undelete: Obnoviť - advice_bendy: Príliš krivá pre narovnanie (SHIFT pre vynútenie) - advice_conflict: Konflikt servera - možno budete musieť skúsiť uložiť znovu - advice_deletingpoi: Mazanie POI (Z pre obnovenie) - advice_deletingway: Vymazávanie cesty (Z pre krok späť) - advice_nocommonpoint: Cesty neobsahujú spoločný bod - advice_revertingpoi: Vrátiť naposledy uložené POI (Z pre krok späť) - advice_revertingway: Vrátiť sa k naposledy uloženej ceste (Z pre krok späť) - advice_tagconflict: Tagy sa nezhoduju - prosím skontrolujte (Z krok späť) - advice_toolong: Príliš dlhé pre odomknutie - prosím rozdeliť na kratšie cesty - advice_uploadempty: Nič nie je na nahratie - advice_uploadfail: Nahrávanie zastavené - advice_uploadsuccess: Všetky údaje sú úspešne nahraté - advice_waydragged: Posunutá cesta (Z pre krok späť) - cancel: Zrušiť - closechangeset: Zatvorenie zmenového súboru - conflict_download: Stiahnite si svoju verziu - conflict_overwrite: Prepísať ich verziu - conflict_poichanged: Počas vašej editácie, niekto iný zmenil bod $1$2. - conflict_relchanged: Počas vašej editácie, niekto iný zmenil reláciu $1$2. - conflict_visitpoi: Kliknite na 'OK' pre zobrazenie bodu. - conflict_visitway: Kliknutie 'Ok' ukáže cestu. - conflict_waychanged: Počas vašej úpravy, niekto iný zmenil cestu $1$2. - createrelation: Vytvoriť novú reláciu - custom: "Vlastné:" - delete: Vymazať - deleting: vymazávanie - drag_pois: Kliknite a ťahajte body záujmu - editinglive: "Režim editácie: okamžité ukladanie" - editingoffline: Úprava offline - emailauthor: \n\nProsím pošlite e-mail na richard\@systemeD.net s chybovou správou, s popisom toho čo ste práve robili. - error_anonymous: Nemôžete kontaktovať anonymného mapéra. - error_connectionfailed: Prepáčte - spojenie s OpenStreetMap serverom bolo neúspešné. Niektoré nedávne zmeny nemusia byť uložené. \n\nBudete si priať skúsiť znovu? - error_microblog_long: "Posielanie na $1 zlyhalo:\nKód HTTP: $2\nChybová správa: $3\n$1 chyba: $4" - error_nopoi: Bod záujmu nebol nájdený (možno ste ho vymazali? ), takže ho neviem obnoviť. - error_nosharedpoint: Cesty $1 and $2 už viac nemajú spoločný bod, takže ich nemôžem rozpojiť. - error_noway: Cesta $1 nebola nájdená (možno ste ju posunuli preč?), preto ju nemôžem vrátiť späť. - error_readfailed: Prepáčte - Server OpenStreetMap neodpovedal na žiadosť o údaje. \n\nBudete si priať skúsiť znovu? - existingrelation: Pridať do existujúcej relácie - findrelation: Nájsť reláciu obsahujúcu - gpxpleasewait: Prosím počkajte pokiaľ je GPX trasa spracovávaná. - heading_drawing: Kreslenie - heading_introduction: Úvod - heading_pois: Začíname - heading_quickref: Rýchle referencie - heading_surveying: Mapovanie - heading_troubleshooting: Riešenie problémov - help: Pomoc - help_html: "Vitajte v Potlatchu\nPotlatch je ľahko použiteľný editor pre OpenStreetMap. Kreslí ulice, cesty, orientačné body a obchody z vašho GPS merania, satelitných snímok. alebo starých máp.\n\nTieto stránky nápovedy vás prevedú základmi použitia Potlachu, a prezradia vám kde možno zistiť viac informácií. Pre začatie kliknite na titulky hore.\n\nKeď chcete skončiť, stačí kliknúť hocikde inde na strane.\n\n\n\nUžitočné známe veci\nNekopírujte z iných máp!\n\nAk vyberiete 'Upravovať naživo' , akékoľvek zmeny ktoré vytvoríte, budú zapísané do databázy hneď ako ich nakreslíte - ako okamžite. Ak ste si nie sebaistý, vyberte 'Úprava s uložením' , a zmeny budú uložené iba keď stlačíte 'Uložiť'.\n\nNiektorá úpravy, ktoré ste urobili budú obvykle viditeľné na mape po jednej až dvoch hodinách (niektoré veci môžu trvať aj týždeň). Nie všetko je zobrazené na mape - môže to vyzerať príliš neuhladené. Avšak pretože OpenStreetMap údaje majú otvorený kód (open source), iný ľudia majú voľnosť pri tvorbe a zobrazení máp s rozdielnymi aspektami - ako OpenCycleMap alebo Midnight Commander.\n\nPamätajte, je to ako pekná mapa (tak kreslite pekné krivky pre zákrutách) a diagram (takže sa uistite či, cesty sú pripojené na križovatkách).\n\nZmienili sme sa o nekopírovaní z iných máp?\n\n\nZistiť viac\nPríručka Potlatchu\nZoznam adries\nOnline rozhovor (live(živá) nápoveda)\nWebové fórum\nKomunita wiki\nPotlatch zdrojový-kód\n\n\n\nZačíname\nTeraz, keď máte otvorený Potlach, kliknite 'Úprava s uložením' pre zahájenie upravovania.\n\nTeraz ste pripravený na kreslenie mapy. Najjednoduchším začiatkom je doplnenie nejakých bodov záujmu do mapy - alebo \"POIs\". To môžu byť krčmy, kostoly, železničné stanice... všetko čo sa vám páči.\n\nŤahať a pustiť\nUrobiť to je veľmi ľahké, budete vidieť výber najčastejších POIs, vpravo v dolnej časti vašej mapy. Umiestnenie jedného na mapu je preto ľahké, dotiahnite ho z tadeto na správne miesto na mape. A nemajte obavy, ak sa vám nepodarí docieliť správnu polohu na prvý krát: môžete ho posúvať znovu, až do správnej polohy. Všimnite si že POI je zvýraznené žltou farbou ak je vybraté.\n\nHneď ako ste hotový, budete chcieť dať vašej krčme (alebo kostolu, alebo žel.stanici) názov. Budete vidieť malú tabuľku, ktorá sa má objaviť v dolnej časti. jeden zo záznamov bude hovoriť \"názov\" nasledovaný s \"(typ názvu tu)\". Vyplňte ju – napíšte text a typ názvu.\n\nKliknite niekde inde na mapu na pre zrušenie výberu vášho POI, a obnovu malého panelu.\n\nBolo to ľahké? Kliknite 'Uložiť' (na spodnej časti dole vpravo) ak ste hotový.\nPremiestňovanie\nAby posun do rôznej časti mapy, správne dotiahol nejakú prázdnu oblasť. Potlatch automaticky načíta nové údaje (pozrite vpravo hore).\n\nPovedali sme vám o 'Upraviť s uložením', ale môžete tiež zapnúť 'Upraviť naživo'. Ak zapnete túto možnosť, váš zmenový súbor sa bude zapisovať do databázy priebežne, preto nebude k dispozícii tlačítko 'Uložiť'. Je to dobré pre okamžité zmeny a mapovacie párty.\n\nĎalšie kroky\nPáčilo sa vám to? Výborne. Kliknite hore na 'Mapovanie' ak chcete zistiť, ako sa stať skutočným mapovačom!\n\nMapovanie s GPS\nHlavná myšlienka za projektom OpenStreetMap je urobiť mapu bez obmedzenia kopírovania, ktoré je teraz na iných mapách. Týmto myslíme, že nie je možné kopírovať z iných mapových podkladov: musíte ísť a sám mapovať ulice. Našťastie je v tom množstvo zábavy! Najlepšou cestou ako to spraviť je ručný GPS prístroj. Nájdite oblasť, kde ešte žiaden mapovač nebol, potom sa prechádzajte po uliciach so zapnutým GPS prístrojom. Zapisujte si názvy ulíc, a niečo iné zaujímavé (krčmy? kostoly? lekárne?), keď ideš okolo nich.\n\nKeď prídete domov, váš GPS bude obsahovať 'záznam stopy' zaznamenaný všade kde ste chodili. Môžete ho potom nahrať na OpenStreetMap.\n\nNajlepší typ pre voľbu GPS je aby frekvencia záznamov bola každú sekundu (alebo dve sekundy) a mala veľa pamäti. Mnoho mapovačov používa ručný Garmin, alebo ručné bluetooth jednotky spojené s PDA, ale aj v spojení s telefónom s vhodným softvérom (napr. http://www.trekbuddy.net/forum/ ). Tu sú detaily GPS Recenzie na našej wiki.\n\nNahrávanie vašej stopy\nTeraz potrebujete nahrať váš záznam stopy z vášho GPS prístroja. Možno váš GPS obsahuje aj nejaký software, alebo možno sa dá kopírovať súbor cez USB. Ak nie, skúste GPSBabel. Podľa dohody, požadovaný súbor musí byť v GPX formáte.\n\nPotom použite tlačítko 'GPS Stopy' pre nahratie vašej stopy na OpenStreetMap. Ale toto je iba prvý krok – ešte sa to nemôžete zobraziť na mape. Musíte vy sám nakresliť a pomenovať cesty, použitím stopy ako vodítka.\nPoužívanie vašej stopy\nVyhľadajte vašu nahratú stopu v 'GPS Stopy' v súpise, a kliknite 'upraviť' ďalšie tlačítko vpravo. Potlatch sa spustí s touto nahratou stopou, plus s niektorými waypointami. Ste pripravený na kreslenie!\n\nMôžete tiež kliknutím na toto tlačítko zobraziť všetky GPS stopy (ale nie waypointy) pre aktuálnu oblasť. Podržaním Shift-u zobrazíte iba vaše stopy.\nPoužívanie satelitných fotiek\nAk nemáte GPS prístroj, nebuďte smutný. V niektorých mestách, máme satelitné fotky, nad ktorými môžete kresliť, s láskavým dovolením Yahoo! (ďakujeme!). Choďte von a zaznamenajte si názvy ulíc, potom sa vráťte a nakreslite nad snímkou línie.\n\nAk nevidíte zbierku satelitných obrázkov, kliknite na tlačítko možnosti a presvedčte sa či máte vybraté 'Yahoo!'. Ak to stále nevidíte, tak pravdepodobne nie je dostupný pre vaše mesto, alebo by ste mohli potrebovať trochu zmenšiť oblasť.\n\nV tejto istej voľbe nastavenia tlačítka môžete nájsť niekoľko iných volieb ako niektoré nechránené mapy autorskými právami z UK, a OpenTopoMap pre US. Tu sú všetky špeciálne vybraté, pretože máme povolenie používať ich – nekopírujte z nejakých iných máp, alebo leteckých fotiek. (Copyright law sucks.)\n\nNiekedy sú satelitné obrázky trochu posunuté z miesta, kde cesty v skutočnosti sú. Ak toto zistíte. podržte klávesu Medzera a dotiahnite pozadie až nad línie. Vždy dôverujte GPS stopám, než satelitným obrázkom.\n\nKreslenie ciest\nNa kresbu komunikácií (alebo 'ciest') začneme na prázdnom mieste na mape, len tam klikneme; potom na každý bod tam kde cesta zabočí. Keď cestu končíme, dvojitý klik, alebo stlačiť Enter – potom klikneme niekde inde, aby sme zrušili výber cesty.\n\nPre kreslenie cesty so začiatkom z inej cesty, kliknite na cestu na jej vybratie; jej body sa zobrazia červene. Držte Shift a kliknite na ten bod, kde začína nová cesta. (Ak nie je červený bod na mieste začiatku cesty, shift-klik na miesto v ceste kde potrebujete ten bod!)\n\nKliknite 'Uložiť' (dole vpravo) ak ste hotový. Ukladajte často, pre prípad, ak by mal server problém.\n\nNečakajte, že sa vaše zmeny objavia v hlavnej mape okamžite. Obvykle to trvá jednu až dve hodiny, niekedy aj viac ako týždeň.\nVytvorenie spojení\nJe to skutočne dôležité, kde sa dve cesty spájajú, oni zdieľajú bod (alebo 'uzol'). Program na plánovanie ciest podľa neho vie, kde má zabočiť.\n\nPotlatch sa stará o to pokiaľ ste opatrne klikli presne na cestu v mieste spojenia. Hľadajte nápomocné značky: body sa rozsvietia namodro, zmení sa ukazovateľ, a keď ste hotový, pripojený bod má čierny obrys.\nPresúvanie a mazanie\nNa vymazanie bodu, vyberte ho a stlačte Delete. Na vymazanie celej cesty, stlačte Shift-Delete.\n\nPre presunutie niečoho, stačí to ťahať. (Podržíte stlačené ľavé tlačítko myši na presúvanej ceste po dobu ťahania cesty myšou, dávajte pozor, aby sa vám to nestalo náhodou.)\nViac pokročilého kreslenia\nAk dve časti cesty majú rozdielny názov, budete ju musieť rozdeliť. Kliknite na cestu; potom kliknite na bod, kde má byť rozdelená a kliknite na nožničky. (Môžete spojiť cesty keď použijete klávesu Ctrl, alebo klávesu Apple na Mac-u. Ale nespájajte dve cesty s rozdielnymi názvami, alebo typmi.)\n\nKruhový objazd je naozaj ťažko nakresliť. Nezúfajte – Potlatch môže pomôcť. Iba nakreslite zhruba kruh, určite ukončite kruh na začiatočnom bode, potom kliknite na ikonu 'usporiadať'. (Toto môžete použiť aj na vyrovnanie ciest.)\nBody záujmu POI\nPrvé čo ste sa naučili bolo, ako doplniť bod záujmu. Môžete ho tiež vytvoriť pomocou dvojkliku na mape: objaví sa zelený kruh. Ale čo to je, či je to krčma, kostol, alebo čo? Kliknite na 'Tagging' – Značkovanie nájdete ho hore!\n\nAký typ komunikácii poznáme?\nAko náhle nakreslíte cestu, budete musieť povedať aká je. Je to vozovka, chodník, alebo rieka? Ako sa volá? Sú na nej nejaké špeciálne obmedzenia (napr. „zákaz pre bicykle“)?\n\nV OpenStreetMap, zaznamenávate toto použitím 'tags' značiek. Tagy(značky) majú dve časti, a môžete ich mať toľko, koľko sa vám bude páčiť. Napríklad, môžete pridať highway | trunkznamená to cesta pre motorové vozidlá; highway | residential pre označenie ulice v obci; alebo highway | footway pre chodník pre peších. Ak bicykle sú zakázané, môžete pridať bicycle | no. Potom zaznamenáme názov, pridáme name | Market Street.\n\nTagy(značky) v Potlatchu sa zobrazujú na spodnej časti obrazovky – Kliknite na existujúcu cestu a budete vidieť aké tagy (značky) obsahuje. Kliknite na znak '+' (vpravo dole) a môžete pridať nový tag (značku). Pomocou klávesy 'x' každý tag (značku) vymažete.\n\nMôžete označiť všetky cesty; body v cestách (napríklad brána, alebo semafor); a body záujmu.\nPoužívanie prednastavených značiek\nDostali sme sa na začiatok, Potlatch má hotové predvoľby obsahujúce najpopulárnejšie tags (značky).\n\nVyberte cestu, potom klikajte medzi symbolmi, až kým nenájdete vhodný. Potom si vyberte najvhodnejšiu možnosť z menu.\n\nVýber doplní tagy(značky) z výberu. Niektoré okienka aj tak zostanú nevyplnené, aby ste mohli napísať (napríklad) názov cesty a číslo.\nJednosmerné cesty\nMohli by ste chcieť pridať tagy, ako oneway | yes - ale, ako zapísať v akom smere? Je tam šípka v ľavo dole, ktorá ukazuje smer cesty, od začiatku po koniec. Kliknutím sem smer cesty otočíte.\nVoľba vašich vlastných tagov.\nSamozrejme, nie ste obmedzený iba na prednastavené tagy(značky). Použitím tlačítka '+', môžete pridať a používať akékoľvek tagy.\n\nMôžete sa pozrieť aké tagy používajú ostatní ľudia OSMdoc, a tu je dlhý obsah obľúbených tagov(značiek) na našej wiki Map Features. Ale tu sú iba návrhy, nie podľa pravidiel. Máte voľnosť pri vymýšľaní vašich vlastných tagov(značiek), alebo môžete prevziať tagy od iných.\n\nPretože OpenStreetMap dáta sú používané pri tvorbe veľmi rôznorodých máp, každá mapa sa bude zobrazovať (alebo 'interpretovať') podľa vlastného výberu tagov.\nRelácie\nNiekedy tagy(značky) nepostačujú, a vy potrebujete 'zoskupiť' dve a viac ciest. Možno zabočenie je zakázané z jednej cesty na druhú, alebo 20 ciest má spoločný znak a popisujú napr. cyklo trasu. Môžete to vytvoriť pokročilými vlastnosťami, ktoré sa volajú 'relácie'. Zistiť viac na wiki.\n\nOprava chýb\nNa to slúži tlačítko Krok späť(undo) (môžete tiež použiť klávesu Z) – vrátite sa k stavu pred poslednou zmenou.\n\nMôžete vrátiť predtým uloženú verziu cesty, alebo bodu. Vyberte ich, potom kliknite na ich ID (číslo v ľavo dolu) – alebo stlačte H (pre 'históriu'). Budete vidieť obsah všetkého čo a kedy ste upravovali. Vyberte ktorý chcete vrátiť späť a kliknite Revert(Navrátiť).\n\nAk ste náhodou vymazali cestu a uložili to, stlačte U (na 'undelete' obnovenie). Všetky vymazané cesty budú zobrazené. Vyberte tú ktorú chcete; odomknite ju kliknutím na červený zámok; a normálne uložte.\n\nZbadali ste, že niekto iný urobil chyby? Pošlite mu priateľskú správu. Použite voľbu história (H) pre výber jeho mena, potom kliknite 'Mail'.\n\nPoužite Kontrolóra (v menu 'Advanced' pre pokročilé nastavenia) pre užitočné informácie o aktuálnej ceste, alebo bode.\nFAQs\nAko môžem vidieť moje trasy?\nTrasy sa zobrazia, iba ak kliknete na 'Upraviť' podľa, názvov stôp v 'GPS Stopy'. Súbor musí mať oboje, body na trase a TrackLog v jednom - server odmieta čokoľvek robiť s osamotenými bodmi.\n\nĎalšie FAQ k Potlatch a OpenStreetMap .\n\n\n\nUrýchlenie práce\nČím viac oddialite obraz, tým viac dát Potlatch načíta. Priblížte obraz späť a kliknite 'Upraviť' edit.\n\nVypnite 'Use pen and hand pointers' Ukazovateľ pero a ruka (v možnostiach okna) pre maximálnu rýchlosť.\n\nAk je server pomalý, skúste to pozdejšie. Skontrolujte wikipre známe problémy. Niekedy, ako v nedeľné večery, je vždy zaneprázdnený.\n\nPotlatch si môže zapamätať vaše obľúbené sady značiek. Vyberte cestu alebo bod s týmito značkami(tags), potom stlačte kláves Ctrl, Shift a číslo od 1 do 9. Potom, na použitie týchto značiek znovu, stačí stlačiť Shift a toto číslo. (Budú v pamäti pri každom použití Potlatchu na tomto počítači.)\n\nPremeňte svoju GPS stopu na cestu tým, že ju nájde v zozname 'GPS Stopy', kliknite na 'Upraviť', začiarknite 'previesť' box. Bude to zamknuté (červená), takže nemôžete uložiť. Najskôr ju upravte, potom kliknite na červený visiaci zámok na odomknutie, ak je pripravená na uloženie.\n\nČo kliknúť\nŤahať mapu na pohybovanie sa.\nDvojitý-klik pre vytvorenie nového POI.\nJeden-klik pre začiatok novej cesty.\nDržať a ťahať cestu alebo POI pre ich presun.\nKeď kreslíte cestu\nDvojitý-klik alebo stlačenie Enteru ukončí kreslenie.\nKlik na inú cestu vytvorí pripojenie.\nShift-klik na koncový bod inej cesty pre zlúčenie.\nKeď je cesta vybratá\nKlik na bod pre zvolenie bodu.\nShift-klik na cestu pre vloženie nového bodu.\nShift-klik na bod pre začiatok novej cesty z tohto miesta.\nControl-klik na inú cestu pre zlúčenie.\n\nKlávesové skratky\nB Add background source tag\nC Zavrieť changeset zmenový súbor\nG Zobraziť GPS stopy\nH Zobraziť históriu\nI Zobraziť inspector kontrolu\nJ Join vložiť bod do križujúcich ciest\n(+Shift) Unjoin from other ways\nK Loc(zamknúť)k/unlock(odomknúť) aktuálny výber\nL Zobraziť aktuálnu latitude(šírku)/longitude(dĺžku)\nM Maximalizovať editovacie okno\nP Vytvoriť parallel rovnobežnú cestu\nR Repeat opakovať tagy\nS Save Uložiť (ak neopravujete naživo)\nT Tidy into straight line/circle\nU Undelete obnoviť(ukázať vymazané cesty)\nX Rozdeliť cestu na dve\nZ Krok späť\n- Remove Odstrániť bod iba z tejto cesty\n+ Add pridať nový tag\n/ Select Vybrať inú cestu, ktorá zdieľa tento bod\nVymazať Vymazať bod\n (+ Shift), Vymazať celú cestu\nNávrat Ukončite kreslenie cesty\nMedzera Podržať a ťahať pozadie\nEsc Prerušiť túto úpravu; opäť načítať zo servera\n0 Odstrániť všetky tagy(značky)\n1-9 Výber prednastavených tags(značiek)\n (+ Shift) Výber značiek z pamäte\n (+ S / Ctrl) Ukladanie značiek do pamäte\n§ alebo ` Prepínať medzi skupinami značiek\n\n" - hint_drawmode: kliknutím pridáte bod\ndvojklik/Návrat\nukončí líniu - hint_latlon: "šírka $1\ndĺžka $2" - hint_loading: nahrávam údaje - hint_overendpoint: nad koncovým bodom ($1)\nklik pre napojenie\nshift-klik pre zlúčenie - hint_overpoint: nad bodom ($1)\nkliknutím spojíte - hint_pointselected: vybratý bod\n(shift-klik na bod pre\n začiatok novej cesty - hint_saving: ukladanie údajov - hint_saving_loading: načítanie/ukladanie údajov - inspector: Kontrola - inspector_in_ways: V cestách - inspector_latlon: "Šírka $1\nDĺžka $2" - inspector_locked: Uzamknutý - inspector_node_count: ($1 krát) - inspector_not_in_any_ways: Nie je v žiadnej ceste (POI) - inspector_unsaved: Neuložené - inspector_uploading: (nahrávanie) - inspector_way_connects_to: Spojuje do $1 ciest - inspector_way_nodes: $1 bodov - inspector_way_nodes_closed: $1 body (zavreté) - loading: Načítava sa... - login_pwd: "Heslo:" - login_retry: Vaše miestne prihlásenie nebolo rozpoznané. Prosím skúste znovu. - login_title: Nemôžem sa prihlásiť - login_uid: "Užívateľské meno:" - more: Viac - newchangeset: "Prosím skúste znovu: Potlach spustí nový zmenový súbor." - "no": Nie - nobackground: Žiadne pozadie - norelations: V aktuálnej oblasti nie sú relácie - offset_broadcanal: Navigácia širokým prielivom - offset_choose: Zvoliť vyrovnanie (m) - offset_dual: Dvojprúdová cesta (D2) - offset_motorway: Dialnica (D3) - offset_narrowcanal: Navigácia úzkym prielivom - ok: Ok - openchangeset: Otvorenie súboru zmien - option_custompointers: Použitie ukazovateľa pera a ruky - option_external: "Externé spustenie:" - option_fadebackground: Zosvetliť pozadie - option_layer_cycle_map: OSM - cyklomapa - option_layer_maplint: OSM - Maplint (chyby) - option_layer_nearmap: "Austrália: NearMap" - option_layer_ooc_25k: "UK historický: 1:25k" - option_layer_ooc_7th: "UK historické: 7." - option_layer_ooc_npe: "UK historické: NPE" - option_layer_ooc_scotland: "UK historické: Škótsko" - option_layer_tip: Vyberte si pozadie pre zobrazenie - option_limitways: Upozorniť pri načítaní priveľa dát - option_noname: Zvýrazniť nepomenované komunikácie - option_photo: "Fotky KML:" - option_thinareas: Použiť tenké čiary pre plochy - option_thinlines: Používať tenké čiary vo všetkých merítkach mapy - option_tiger: Označiť nezmenený TIGER - option_warnings: Zobrazovať plávajúce varovania - point: Bod - preset_icon_airport: Letisko - preset_icon_bar: Bar - preset_icon_bus_stop: Zastávka autobusu - preset_icon_cafe: Kaviareň - preset_icon_cinema: Kino - preset_icon_fast_food: Rýchle občerstvenie - preset_icon_ferry_terminal: Prievoz - preset_icon_fire_station: Hasičská stanica - preset_icon_hospital: Nemocnica - preset_icon_hotel: Hotel - preset_icon_museum: Múzeum - preset_icon_parking: Parkovanie - preset_icon_pharmacy: Lekáreň - preset_icon_place_of_worship: Kostol - preset_icon_police: Policajná stanica - preset_icon_post_box: Poštová schránka - preset_icon_pub: Krčma - preset_icon_restaurant: Reštaurácia - preset_icon_school: Škola - preset_icon_station: Železničná stanica - preset_icon_supermarket: Supermarket - preset_icon_taxi: Stanovisko taxi - preset_icon_telephone: Telefón - preset_icon_theatre: Divadlo - preset_tip: Vyberte z menu prednastavené tagy charakterizujúce $1 - prompt_addtorelation: Pridať $1 do relácie - prompt_changesetcomment: "Napíšte popis urobených zmien:" - prompt_closechangeset: Zavrieť zmenový súbor $1 - prompt_createparallel: Vytvoriť súbežnú cestu - prompt_editlive: Ukladať okamžite - prompt_editsave: Ukladať naraz - prompt_helpavailable: Nový užívateľ? Nápovedu nájdete vpravo dole. - prompt_launch: Otvoriť externú URL - prompt_live: V režime Live, každý prvok čo zmeníte bude uložený v databáze OpenStreetMap okamžite - nie je doporučené pre začiatočníkov. Ste si istí? - prompt_revertversion: "Vrátiť sa k skoršie uloženej verzii:" - prompt_savechanges: Uložiť zmeny - prompt_taggedpoints: Niektoré body tejto cesty majú tagy, alebo sú v reláciách. Naozaj vymazať? - prompt_track: Zmeniť GPS stopy na cesty - prompt_unlock: Klik pre odomknutie - prompt_welcome: Vitajte na OpenStreetMap ! - retry: Opakovať - revert: Vrátiť sa - save: Uložiť zmeny - tags_backtolist: Späť na zoznam - tags_findatag: Nájdite značku - tags_typesearchterm: "Zadajte slovo pre hľadanie:" - tip_addrelation: Pridať do relácie - tip_addtag: Pridať nový tag - tip_alert: Nastala chyba - kliknite pre podrobnosti - tip_anticlockwise: Uzavretá cesta proti smeru hodinových ručičiek - kliknutím otočíte smer - tip_clockwise: Uzavretá cesta v smere hodinových ručičiek - kliknutím otočíte smer - tip_direction: Smer cesty - kliknutím otočíte smer - tip_gps: Zobraziť GPS stopy (G) - tip_noundo: Nie je čo vrátiť späť - tip_options: Možnosti (vyberte si mapu na pozadí) - tip_photo: Načítať fotky - tip_presettype: Vyberte, ktorý typ predvolieb bude ponúknutý v menu. - tip_repeattag: Doplniť tagy z predchádzajúcej vybratej cesty (R) - tip_revertversion: Vyberte dátum ku ktorému sa chcete vrátiť - tip_selectrelation: Pridať k vybratej ceste - tip_splitway: Rozdeliť cestu vo zvolenom bode (X) - tip_tidy: Usporiadať body v ceste (T) - tip_undo: Krok späť $1 (Z) - uploading: Nahrávanie. . . - uploading_deleting_pois: Mazanie POI - uploading_deleting_ways: Vymazávanie ciest - uploading_poi: Nahrávanie POI $1 - uploading_poi_name: Nahrávanie POI $1, $2 - uploading_relation: Nahrávanie relácie $1 - uploading_relation_name: Nahrávanie relácie $1, $2 - uploading_way: Nahrávanie cesty $1 - uploading_way_name: Nahrávaná cesta $1, $2 - warning: Varovanie! - way: Cesta - "yes": Áno diff --git a/config/potlatch/locales/sl.yml b/config/potlatch/locales/sl.yml deleted file mode 100644 index e825ea0a1..000000000 --- a/config/potlatch/locales/sl.yml +++ /dev/null @@ -1,229 +0,0 @@ -# Messages for Slovenian (Slovenščina) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Dbc334 -# Author: Lesko987 -sl: - a_poi: $1 POI - a_way: $1 pot - action_addpoint: dodajanje točke na konec poti - action_cancelchanges: preklic sprememb - action_changeway: spremembe poti - action_createparallel: ustvarjanje vzporednih poti - action_createpoi: ustvarjanje POI - action_deletepoint: brisanje točke - action_insertnode: dodajanje vozlišča na pot - action_mergeways: združevanje dveh poti - action_movepoi: prestavitve POI - action_movepoint: premikanje točke - action_moveway: prestavljanje poti - action_pointtags: določanje oznak točke - action_poitags: nastavljanje oznak na POI - action_reverseway: obračanje poti - action_revertway: restavriranje poti - action_splitway: razdelitev poti - action_waytags: določanje oznak poti - advanced: Napredno - advanced_close: Zapri paket sprememb - advanced_history: Zgodovina poti - advanced_inspector: Inšpektor - advanced_maximise: Maksimiraj okno - advanced_minimise: Minimiraj okno - advanced_parallel: Vzporedna pot - advanced_tooltip: Napredna dejanja urejanja - advanced_undelete: Obnovi - advice_bendy: Preveč ukrivljena za poravnavo (SHIFT za prisiljeno poravnavo) - advice_conflict: Konflikt na strežniku - morda morate ponovno shraniti - advice_deletingpoi: Brisanje POI (Z za razveljavitev) - advice_deletingway: Brisanje poti (Z za razveljavitev) - advice_microblogged: Spremenjen vaš $1 status - advice_nocommonpoint: Poti nimata skupne točke - advice_revertingpoi: Restavriranje shranjenih POI (Z razveljavi) - advice_revertingway: Restavriranje shranjenih poti (Z razveljavi) - advice_tagconflict: Oznake se ne ujemajo – prosimo, preverite (Z za razveljavitev) - advice_toolong: Predolga za odklepanje - prosim razbijte na krajše poti - advice_uploadempty: Nič ni za naložiti - advice_uploadfail: Nalaganje ustavljeno - advice_uploadsuccess: Vsi podatki so se uspešno naložili - advice_waydragged: Pot prestavljena (Z za razveljavitev) - cancel: Prekliči - closechangeset: Zapiram paket sprememb - conflict_download: Prenesi njihovo različico - conflict_overwrite: Prepiši njihovo različico - conflict_poichanged: Od začetka urejanja je nekdo spremenil točko $1$2. - conflict_relchanged: Od začetka urejanja je nekdo spremenil zvezo $1$2. - conflict_visitpoi: Kliknite 'V redu' za prikaz točke. - conflict_visitway: Kliknite 'Ok' za prikaz poti. - conflict_waychanged: Od začetka urejanja je nekdo spremenil pot $1$2. - createrelation: Naredi novo zvezo - custom: "Po meri:" - delete: Izbriši - deleting: brisanje - drag_pois: Povleci in spusti POI - editinglive: Urejanje v živo - editingoffline: Urejanje brez povezave - emailauthor: \n\nProsim pošljite e-mail richard@systemeD.net z opisom napake in opišite kaj ste pred tem počeli. - error_anonymous: Ne morete kontaktirati anonimnega kartografa. - error_connectionfailed: Oprostite - povezava s strežnikom OpenStreetMap prekinjena. Nedavne spremembe se niso shranile.\n\nŽelite poskusiti znova? - error_microblog_long: "Poriljanje $1 ni uspelo:\nHTTP koda: $2\nNapaka: $3\n$1 napaka: $4" - error_nopoi: POI ni mogoče najti (morda ste se prestavili drugam?), tako da ne morem razveljaviti. - error_nosharedpoint: Poti $1 in $2 nimata več skupne točke, tako da ne morem razveljaviti razbijanja. - error_noway: Pot ni mogoče najti (morda ste se prestavili drugam?), tako da ne morem razveljaviti. - error_readfailed: Oprostite - OpenStreetMap strežnik se ni odzval z želenimi podatki.\n\nAli želite poskusiti znova? - existingrelation: Dodaj v obstoječo zvezo - findrelation: Poišči zvezo - gpxpleasewait: Počakajte, da se obdela GPX sled. - heading_drawing: Risanje - heading_introduction: Predstavitev - heading_pois: Kako začeti - heading_quickref: Hitra pomoč - heading_surveying: Merjenje - heading_tagging: Označevanje - heading_troubleshooting: Odpravljanje težav - help: Pomoč - hint_drawmode: klik - dodaj točko\nddvoklik/Enter\nzaključi vnos - hint_latlon: "šir: $1\ndol: $2" - hint_loading: nalaganje podatkov - hint_overendpoint: na končni točk1 ($1)\nklik za pridružitev\nshift-klik za združitev - hint_overpoint: na točki ($1)\nklik za pridružitev - hint_pointselected: točka izbrana\n(shift-klik na točko\nza novo pot) - hint_saving: shranjevanje podatkov - hint_saving_loading: nalaganje/shranjevanje podatkov - inspector: Inšpektor - inspector_duplicate: Dvojnik - inspector_in_ways: V poteh - inspector_latlon: "Šir. $1\nDol. $2" - inspector_locked: Zaklenjeno - inspector_node_count: ($1-krat) - inspector_not_in_any_ways: Ni v nobeni poti - inspector_unsaved: "\nNi shranjeno" - inspector_uploading: (nalaganje) - inspector_way_connects_to: Povezan na $1 poti - inspector_way_connects_to_principal: Povezan na $1 $2 in $3 $4 - inspector_way_nodes: $1 vozlišč - inspector_way_nodes_closed: $1 vozlišč (zaključeno) - loading: Nalaganje ... - login_pwd: "Geslo:" - login_retry: Vaše uporabniško ime ni prepoznano. Prosimo, poskusite znova. - login_title: Ne morem se prijaviti - login_uid: "Uporabniško ime:" - mail: Pošta - more: Več - newchangeset: "\nProsimo, poskusite znova: Potlatch bo naredil nov paket sprememb." - "no": Ne - nobackground: Brez ozadja - norelations: Ni zvez na trenutnem območju - offset_broadcanal: Pot po širokem kanalu - offset_choose: Izberite odmik (m) - offset_dual: Avtocesta (D2) - offset_motorway: Avtocesta (D3) - offset_narrowcanal: Pot po ozkem kanalu - ok: V redu - openchangeset: Odpiram paket sprememb - option_custompointers: Uporabljajte pisalo in roko za kazalce - option_external: "Zunanji zagon:" - option_fadebackground: Zameglitev ozadje - option_layer_cycle_map: OSM - kolesarska - option_layer_maplint: OSM - Maplint (napake) - option_layer_nearmap: "Avstralija: NearMap" - option_layer_ooc_25k: "VB: zgodovinska: 1:25k" - option_layer_ooc_7th: "VB: zgodovinska 7st" - option_layer_ooc_npe: "VB: zgodovinska NPE" - option_layer_ooc_scotland: "VB: zgodovinska: Škotska" - option_layer_os_streetview: "VB: OS Streetview" - option_layer_streets_haiti: "Haiti: imena ulic" - option_layer_surrey_air_survey: "VB: Surrey Air Survey" - option_layer_tip: Izberi ozadje karte - option_limitways: Opozori pri nalaganju veliko podatkov - option_microblog_id: "Ime mikrobloga:" - option_microblog_pwd: "Geslo mikrobloga:" - option_noname: Označi neimenovane ceste - option_photo: "Fotografija KML:" - option_thinareas: Uporabi tanjše črte za območja - option_thinlines: Uporabite tanke črte pri vseh merilih - option_tiger: Označi nespremenjen TIGER - option_warnings: Prikaži plavajoča opozorila - point: Točka - preset_icon_airport: Letališče - preset_icon_bar: Bar - preset_icon_bus_stop: Avtobusna postaja - preset_icon_cafe: Kavarna - preset_icon_cinema: Kinematograf - preset_icon_convenience: Trgovina - preset_icon_disaster: Stavba Haiti - preset_icon_fast_food: Hitra hrana - preset_icon_ferry_terminal: Trajekt - preset_icon_fire_station: Gasilska postaja - preset_icon_hospital: Bolnišnica - preset_icon_hotel: Hotel - preset_icon_museum: Muzej - preset_icon_parking: Parkirišče - preset_icon_pharmacy: Lekarna - preset_icon_place_of_worship: Svetišče - preset_icon_police: Policijska postaja - preset_icon_post_box: Nabiralnik - preset_icon_pub: Pivnica - preset_icon_recycling: Recikliranje - preset_icon_restaurant: Restavracija - preset_icon_school: Šola - preset_icon_station: Železniška postaja - preset_icon_supermarket: Supermarket - preset_icon_taxi: Taxi - preset_icon_telephone: Telefon - preset_icon_theatre: Gledališče - preset_tip: Izberite iz menija prednastavljene oznake, ki opisujejo $1 - prompt_addtorelation: Dodaj $1 zvezi - prompt_changesetcomment: "Vnesite opis vaših sprememb:" - prompt_closechangeset: Zapri paket sprememb $1 - prompt_createparallel: Ustvari vzporedno pot - prompt_editlive: Urejanje v živo - prompt_editsave: Urejanje s shranjevanjem - prompt_helpavailable: Nov uporabnik? Uporabite pomoč v spodnjem levem vogalu. - prompt_launch: Zaženi zunanji URL - prompt_live: Pri načinu vnosa v živo se bo vsaka sprememba takoj shranil v OpenStreetMap zbirko podatkov. Ta način vnosa ni priporočljiv za začetnike. Ali ste prepričani? - prompt_manyways: To območje je zelo podrobno in se bo dolgo nalagalo. se želite približati? - prompt_microblog: Objavi v $1 ($2 na voljo) - prompt_revertversion: "Restavriranje na shranjene različice:" - prompt_savechanges: Shrani spremembe - prompt_taggedpoints: Nekatere točke na poti so označene ali v zvezi. Vseeno brišem? - prompt_track: Pretvori GPS sled v pot - prompt_unlock: Kliknite za odklenitev - prompt_welcome: Dobrodošli na OpenStreetMap! - retry: Poskusi znova - revert: Restavriraj - save: Shrani - tags_backtolist: Nazaj na seznam - tags_descriptions: Opisi '$1' - tags_findatag: Najdi oznako - tags_findtag: Poišči oznako - tags_matching: Priljubljene oznake, ki ustrezajo '$1' - tags_typesearchterm: "Vnesi besedo za iskanje:" - tip_addrelation: Dodaj zvezo - tip_addtag: Dodaj novo oznako - tip_alert: Prišlo je do napake – kliknite za podrobnosti - tip_anticlockwise: Krožna pot v nasprotni smeri urinega kazalca - tip_clockwise: Krožna pot v smeri urinega kazalca - tip_direction: Obrni smer poti - tip_gps: Pokaži GPS sledi (G) - tip_noundo: Nič ni za razveljaviti - tip_options: Nastavlitve (izberite podlogo zemljevida) - tip_photo: Naloži slike - tip_presettype: Izberite vrsto oznak v meniju. - tip_repeattag: Ponovite oznake iz prejšnje poti (R) - tip_revertversion: Izberite datum restavriranja - tip_selectrelation: Dodaj izbrani poti - tip_splitway: Razbij pot na izbrani točki (X) - tip_tidy: Poravnaj točke poti (T) - tip_undo: Razveljavi $1 (Z) - uploading: Nalaganje ... - uploading_deleting_pois: Brisanje POI-jev - uploading_deleting_ways: Brisanje poti - uploading_poi: Nalaganje POI $1 - uploading_poi_name: Nalaganje POI $1, $2 - uploading_relation: Nalaganje zveze $1 - uploading_relation_name: Nalaganje zveze $1, $2 - uploading_way: Nalaganje poti $1 - uploading_way_name: Nalaganje poti $1, $2 - warning: Opozorilo! - way: Pot - "yes": Da diff --git a/config/potlatch/locales/sr.yml b/config/potlatch/locales/sr.yml deleted file mode 100644 index 70f31e203..000000000 --- a/config/potlatch/locales/sr.yml +++ /dev/null @@ -1,231 +0,0 @@ -# Messages for Serbian Cyrillic ekavian (‪Српски (ћирилица)‬) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Charmed94 -# Author: Nikola Smolenski -# Author: Rancher -# Author: Милан Јелисавчић -sr-EC: - a_poi: $1 тачку интереса - a_way: $1 путању - action_addpoint: додајем тачку на крај пута - action_cancelchanges: поништавам измене за - action_changeway: измене на путу - action_createparallel: стварам упоредне путеве - action_createpoi: стварам тачке интереса - action_deletepoint: бришем тачку - action_insertnode: додајем чвор у путању - action_mergeways: спајам два пута - action_movepoi: премештам тачке интереса - action_movepoint: премештам тачку - action_moveway: померам путању - action_pointtags: постављам ознаке на тачку - action_poitags: постављам ознаке на занимљиву тачку - action_reverseway: преокрећем путању - action_revertway: враћам путању - action_splitway: раздељујем путању - action_waytags: постављам ознаке на путању - advanced: Напредно - advanced_close: Затвори скуп измена - advanced_history: Историја пута - advanced_inspector: Надзорник - advanced_maximise: Увећај прозор - advanced_minimise: Умањи прозор - advanced_parallel: Упоредна путања - advanced_tooltip: Напредно уређивање - advanced_undelete: Врати - advice_bendy: Превише кривудаво за исправљање (шифт приморава радњу) - advice_conflict: Сукоби на серверу. Покушајте поново да сачувате. - advice_deletingpoi: Брисање тачке интереса - advice_deletingway: Брисање пута - advice_microblogged: Ваш статус $1 је ажуриран - advice_nocommonpoint: Путеви не деле заједничку тачку - advice_revertingpoi: Враћање на раније сачувану тачку интереса - advice_revertingway: Враћање на раније сачувани пут - advice_tagconflict: Ознаке се не поклапају. Проверите их - advice_toolong: Предугачко за откључавање. Поделите га на краће путеве - advice_uploadempty: Нема шта да се отпреми - advice_uploadfail: Отпремање је заустављено - advice_uploadsuccess: Подаци су успешно отпремљени - advice_waydragged: Путања је превучена (Z за опозив) - cancel: Откажи - closechangeset: Затварам скуп измена - conflict_download: Преузми њихово издање - conflict_overwrite: Замени туђе издање - conflict_poichanged: Откако сте почели да уређујете, неко други је променио тачку $1$2. - conflict_relchanged: Откако сте почели да уређујете, неко други је променио однос $1$2. - conflict_visitpoi: Кликните на „У реду“ за приказ тачке. - conflict_visitway: Кликните на „У реду“ за приказ пута. - conflict_waychanged: Откако сте почели да уређујете, неко други је променио путању $1$2. - createrelation: Направи нови однос - custom: "Прилагођено:" - delete: Обриши - deleting: бришем - drag_pois: Превуци и спусти занимљиве тачке - editinglive: Живо уређивање - editingoffline: Уређивање ван мреже - emailauthor: \n\nПријавите грешку на richard@systemeD.net и реците нам шта сте радили у то време. - error_anonymous: Не можете контактирати анонимног мапера. - error_connectionfailed: Жао нам је, али веза са сервером није успостављена. Скорашње измене нису сачуване.\n\nЖелите ли да покушате поново? - error_microblog_long: "Не могу да пошаљем на $1:\nHTTP кôд: $2\nПорука грешке: $3\n$1 грешка: $4" - error_nopoi: Тачка интереса није пронађена, тако да се радња не може опозвати. - error_nosharedpoint: Путеви $1 и $2 више не деле заједничку тачку, па се не могу раздвојити. - error_noway: Путања $1 није пронађена, тако да се радња не може опозвати. - error_readfailed: Жао нам је, али сервер не одговара на тражење података.\n\nЖелите ли да покушате поново? - existingrelation: Додај постојећем односу - findrelation: Пронађи однос који садржи - gpxpleasewait: Причекајте док се GPX стаза обрађује. - heading_drawing: Цртање - heading_introduction: Увод - heading_pois: Почетак - heading_quickref: Брзи преглед - heading_surveying: Истраживање - heading_tagging: Означавање - heading_troubleshooting: Решавање проблема - help: Помоћ - hint_drawmode: кликните за додавање тачке\nдвоструки клик или ентер\nза крај линије - hint_latlon: "ГШ $1\nГД $2" - hint_loading: учитавање података - hint_overendpoint: преко границе ($1)\nкликните да се прикључите\nшифт за спајање - hint_overpoint: изнад тачке ($1)\nкликните за спајање - hint_pointselected: тачка је изабрана\n(кликните шифтом за\nзапочињање нове линије) - hint_saving: чување података - hint_saving_loading: учитавање/чување података - inspector: Надзорник - inspector_duplicate: Дупликат од - inspector_in_ways: На путевима - inspector_latlon: "ГШ $1\nГД $2" - inspector_locked: Закључано - inspector_node_count: ($1 пута) - inspector_not_in_any_ways: Нема ни у једном путу (POI) - inspector_unsaved: Несачувано - inspector_uploading: (отпремање) - inspector_way_connects_to: Повезује са на $1 путева - inspector_way_connects_to_principal: Повезује са на $1 $2 и $3 других $4 - inspector_way_nodes: $1 тачака - inspector_way_nodes_closed: $1 тачака (затворено) - loading: Учитавам… - login_pwd: "Лозинка:" - login_retry: Ваши подаци за пријаву нису препознати. Покушајте поново. - login_title: Не могу да се пријавим - login_uid: "Корисничко име:" - mail: Пошта - more: Више - newchangeset: "Покушајте поново: Потлач ће започети нови скуп измена." - "no": Не - nobackground: Без позадине - norelations: Нема односа у текућем подручју - offset_broadcanal: Пут за вучу уз широки канал - offset_choose: Изаберите размак (м) - offset_dual: Пут с два коловоза (D2) - offset_motorway: Ауто-пут (D3) - offset_narrowcanal: Пут за вучу уз уски канал - ok: У реду - openchangeset: Отварам скуп измена - option_custompointers: Користи оловку и ручне показиваче - option_external: "Спољно покретање:" - option_fadebackground: Избледи позадину - option_layer_cycle_map: ОСМ – бициклистичка мапа - option_layer_maplint: ОСМ – Маплинт (грешке) - option_layer_nearmap: "Аустралија: Нирмап" - option_layer_ooc_25k: "УК историјски: 1:25.000" - option_layer_ooc_7th: "УК историјски: 7." - option_layer_ooc_npe: "УК историјски: NPE" - option_layer_ooc_scotland: "УК историјски: Шкотска" - option_layer_os_streetview: "УК: преглед улица" - option_layer_streets_haiti: "Хаити: називи улица" - option_layer_surrey_air_survey: "УК: фотографије из ваздуха" - option_layer_tip: Изаберите позадину за приказ - option_limitways: Упозори ме када се учитава много података - option_microblog_id: "Назив микроблога:" - option_microblog_pwd: "Лозинка микроблога:" - option_noname: Истакни безимене путеве - option_photo: "Фотографија KML:" - option_thinareas: Користи танке линије за подручја - option_thinlines: Користи танке линије у свим размерама - option_tiger: Истакни непромењени TIGER - option_warnings: Прикажи плутајућа упозорења - point: Тачка - preset_icon_airport: Аеродром - preset_icon_bar: Бар - preset_icon_bus_stop: Аутобуска станица - preset_icon_cafe: Кафе - preset_icon_cinema: Биоскоп - preset_icon_convenience: Потрепштине - preset_icon_disaster: Зграда у Хаитију - preset_icon_fast_food: Брза храна - preset_icon_ferry_terminal: Скела - preset_icon_fire_station: Ватрогасна станица - preset_icon_hospital: Болница - preset_icon_hotel: Хотел - preset_icon_museum: Музеј - preset_icon_parking: Паркинг - preset_icon_pharmacy: Апотека - preset_icon_place_of_worship: Свето место - preset_icon_police: Полицијска станица - preset_icon_post_box: Поштанско сандуче - preset_icon_pub: Паб - preset_icon_recycling: Рециклажа - preset_icon_restaurant: Ресторан - preset_icon_school: Школа - preset_icon_station: Железничка станица - preset_icon_supermarket: Супермаркет - preset_icon_taxi: Такси станица - preset_icon_telephone: Телефон - preset_icon_theatre: Позориште - preset_tip: Изаберите из менија унапред направљених ознака и опишите $1 - prompt_addtorelation: Додај $1 односу - prompt_changesetcomment: "Унесите опис ваших измена:" - prompt_closechangeset: Затвори скуп измена $1 - prompt_createparallel: Стварање упоредног пута - prompt_editlive: Уређуј наживо - prompt_editsave: Уређуј с чувањем - prompt_helpavailable: Нови сте корисник? Потражите помоћ у доњем левом углу. - prompt_launch: Покрени спољну адресу - prompt_live: У живом режиму, свака ставка коју измените биће сачувана у бази података истог тренутка. Јесте ли сигурни? - prompt_manyways: Ово подручје је врло детаљно и захтеваће много времена да се учита. Желите ли да увећате мапу? - prompt_microblog: Постави на $1 ($2 преостало) - prompt_revertversion: "Врати на раније сачувано издање:" - prompt_savechanges: Сачувај измене - prompt_taggedpoints: Неке од тачака на овом путу су означене или су у односима. Обрисати их? - prompt_track: Претвори ГПС трагове у путеве - prompt_unlock: Кликните да откључате - prompt_welcome: Добро дошли у Опенстритмап! - retry: Покушај поново - revert: Врати - save: Сачувај - tags_backtolist: Назад на списак - tags_descriptions: Описи за „$1“ - tags_findatag: Пронађи ознаку - tags_findtag: Пронађи ознаку - tags_matching: Популарне ознаке које се поклапају са „$1“ - tags_typesearchterm: "Унесите реч за тражење:" - tip_addrelation: Додај односу - tip_addtag: Додај нову ознаку - tip_alert: Дошло је до грешке. Кликните за детаље - tip_anticlockwise: Кружна путања налево – кликните да обрнете смер - tip_clockwise: Кружна путања надесно – кликните да обрнете смер - tip_direction: Смер пута. Кликните да га обрнете - tip_gps: Прикажи ГПС трагове (G) - tip_noundo: Нема шта да се опозове - tip_options: Поставке (изаберите позадину мапе) - tip_photo: Учитај фотографије - tip_presettype: Изаберите која су претподешавања понуђена у менију. - tip_repeattag: Понови ознаке претходног изабраног пута (R) - tip_revertversion: Изаберите датум на који желите да вратите - tip_selectrelation: Додај изабраној рути - tip_splitway: Раздвоји путању на изабраној тачки (X) - tip_tidy: Исправи тачке у путу (Т) - tip_undo: Опозови $1 (Z) - uploading: Отпремам… - uploading_deleting_pois: Бришем тачке интереса - uploading_deleting_ways: Бришем путеве - uploading_poi: Отпремам занимљиве тачке $1 - uploading_poi_name: Отпремам занимљиве тачке $1, $2 - uploading_relation: Отпремам однос $1 - uploading_relation_name: Отпремам однос $1, $2 - uploading_way: Отпремам путању $1 - uploading_way_name: Отпремам путању $1, $2 - warning: Упозорење! - way: Путања - "yes": Да diff --git a/config/potlatch/locales/sv.yml b/config/potlatch/locales/sv.yml deleted file mode 100644 index 0bdc894ce..000000000 --- a/config/potlatch/locales/sv.yml +++ /dev/null @@ -1,237 +0,0 @@ -# Messages for Swedish (Svenska) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Ainali -# Author: Cohan -# Author: Grillo -# Author: Jas -# Author: Liftarn -# Author: McDutchie -# Author: Per -# Author: Sertion -# Author: WikiPhoenix -sv: - a_poi: $1 en POI - a_way: $1 en väg - action_addpoint: lägger till en punkt på slutet av en väg - action_cancelchanges: avbryter ändringar på - action_changeway: ändringar på en väg - action_createparallel: Skapar parallell väg - action_createpoi: Skapa en POI, "intressepunkt" - action_deletepoint: tar bort en punkt - action_insertnode: lägger till en punkt till en väg - action_mergeways: Slå samman två vägar - action_movepoi: Flytta på en POI, "intressepunkt" - action_movepoint: flyttar en punkt - action_moveway: flyttar en väg - action_pointtags: lägger till taggar på en punkt - action_poitags: lägger till taggar på en POI - action_reverseway: byter rikting på en väg - action_revertway: återställer en väg - action_splitway: delar upp en väg - action_waytags: lägger till taggar på en väg - advanced: Avancerat - advanced_close: Stäng ändringsset - advanced_history: Väghistorik - advanced_inspector: Inspektör - advanced_maximise: Maximera fönster - advanced_minimise: Minimera fönster - advanced_parallel: Parallell väg - advanced_tooltip: Avancerade editeringsåtgärder - advanced_undelete: Ångra radering - advice_bendy: För kurvig för att räta upp (SHIFT forcerar) - advice_conflict: Serverkonflikt - du kanske behöver försöka spara igen - advice_deletingpoi: Raderar POI (Z ångrar) - advice_deletingway: Raderar väg (Z för att ångra) - advice_microblogged: Uppdaterat din $1 status - advice_nocommonpoint: Sträckorna har ingen gemensam nod - advice_revertingpoi: Återställer till senast sparade POI (Z ångrar) - advice_revertingway: Återställer senast sparade väg (Z för att ångra) - advice_tagconflict: Etiketter (tag) matchar inte - vänligen kontrollera (Z för att ångra) - advice_toolong: Det tog för lång tid att låsa upp - vänligen dela i kortare sträckor - advice_uploadempty: Ingenting att ladda upp - advice_uploadfail: Uppladdning avbruten - advice_uploadsuccess: Datauppladdning lyckades - advice_waydragged: Hela sträckan flyttades (Z för att ångra) - cancel: Avbryt - closechangeset: Stänger ändringsset - conflict_download: Ladda ner deras version - conflict_overwrite: Skriv över deras version - conflict_poichanged: Efter att du började editera har någon annan ändrat punkt $1$2. - conflict_relchanged: Efter att du började editera har någon annan ändrat relation $1$2. - conflict_visitpoi: Klicka 'Ok' för att visa punkten. - conflict_visitway: Klicka 'Ok' för att visa vägen. - conflict_waychanged: Efter att du börjat redigera har någon annan ändrat sträcka $1$2. - createrelation: Skapa en ny relation - custom: "Anpassad:" - delete: Radera - deleting: tar bort - drag_pois: Drag och släpp intressepunkter (POI) - editinglive: Ändrar direkt - editingoffline: Redigerar offline - emailauthor: \n\nVänligen e-posta richard\@systemeD.net med en felrapport som beskriver vad du gjorde när felet inträffade. - error_anonymous: Du kan inte kontakta en anonym kartritare. - error_connectionfailed: "Tyvärr har vi tappat kontakten med OpenStreetMap-serven. Nygjorda ändringar har inte kunnat sparas.\n\nFörsöka återansluta?" - error_microblog_long: "Postningen till $1 fungerade ej:\nHTTP kod: $2\nFelmeddelande: $3\n$1 fel: $4" - error_nopoi: POI:n kan inte hittas (du kanske har flyttat den utanför bilden?) så det går inte att ångra. - error_nosharedpoint: Vägarna $1 och $2 möts inte i någon punkt längre, så det går inte att ångra delningen. - error_noway: Vägen $1 kan inte hittas (du kanske har flyttat den utanför bilden?) så det går inte att ångra. - error_readfailed: OpenStreetMap-servern svarade inte på förfrågan om data.\n\nVill du försöka igen? - existingrelation: Lägg till existerande relation - findrelation: Sök efter relation innehållande - gpxpleasewait: GPX-loggen bearbetas, var god vänta. - heading_drawing: Att rita - heading_introduction: Introduktion - heading_pois: Komma igång - heading_quickref: Snabbreferens - heading_surveying: Kartläggning - heading_tagging: Taggning - heading_troubleshooting: Felsökning - help: Hjälp - help_html: "Välkommen till Potlatch\nPotlatch är en enkel editor för OpenStreetMap. Lägg in vägar, stigar, affärer och så vidare från dina GPS-spår, fria satellitbilder eller gamla kartor.\n\nDe här hjälpsidorna kommer att guida dig igenom de grundläggande funktionerna i Potlatch och var du kan hitta mer information. Klicka på rubrikerna ovan för att börja.\n\nNär du är klar klickar du bara någonstans på sidan.\n\n\n\nBra att veta\nKopiera inte från andra kartor!\n\nOm du väljer 'Ändra direkt' så kommer alla ändringar att skrivas direkt till databasen. Om du inte är så säker välj istället 'Ändra via spara' och ändringarna skrivs till databasen först när du trycker på 'Spara'.\n\nAlla ändringar du gör visas oftast på kartan inom en timma eller två. Ibland kan det ta upp till en vecka. Alla detaljer visas inte på kartan, då det skulle bli för plottrigt. Men eftersom OpenStreetMaps data är fri, kan andra personer utnyttja datan till att göra kartor som visar andra aspekter. Exempel på detta är OpenCycleMap och Midnight Commander.\n\nKom ihåg att det är både en snygg karta (så rita fina kurvor) och ett diagram (se till att vägar hänger ihop i korsningar).\n\nNämnde vi det där om att inte kopiera från andra kartor?\n\n\nLär dig mer\nPotlatchs manual\nE-postlistor\nChatta (direkthjälp)\nWeb-forum\nGruppwiki\nPotlatchs källkod\n\n\n\nKom igång\nNu när du har startat Potlatch, klicka på 'Ändra via spara' för att komma igång.\n\nSå, nu är du redo att rita en karta. Det enklaste är att lägga till några intressepunkter, så kallade POI. Det kan vara sådant som restauranger, kyrkor, stationer... Vad som helst som du tycker är viktigt.\n\nDrag och släpp\nFör att göra det enkelt, så ser du en samling av de mest vanliga POI:n ('inressepunkterna') under kartan. Att lägga in en på kartan är enkelt, klicka på ikonen och drag den till rätt ställe på kartan. Var inte orolig, om du skulle placera den fel, så kan du bara klicka på den igen och dra den till rätt ställe. Ikonen kommer vara markerad med gul färg, för att visa dig att den är vald.\n\nNär du väl lagt ut din POI, så kan du ge den ett namn. Du kan se att en liten tabell har dykt upp under kartan. Ett av alternativen där heter \"name\" följt av \"(type name here)\". Gör just det, klicka på texten och skriv namnet.\n\nKlicka någon annanstans på kartan för att avmarkera din POI, nu kommer den färgglada panelen med ikoner tillbaks.\n\nEnkelt, eller hur? Klicka på 'Spara' (nedre högra hörnet) när du är klar.\nFlytta runt\nFör att se en annan del av kartan, så är det bara att klicka på ett tomt ställe i kartan och dra. Potlatch kommer automatiskt att hämta data för det nya området (du kan se detta i övre högra hörnet).\n\nVi bad dig välja 'Ändra via spara', men du kan också välja 'Ändra direkt'. Om du gör det så kommer dina förändringar att skrivas till databasen direkt utan att du behöver trycka på 'Spara' knappen. Detta sätt är bra för snabba små ändringar och karterings partyn.\n\nNästa steg\nNöjd så långt? Bra! Klicka på 'Kartläggning' ovan för att lära dig mer om hur du blir en riktig kartritare!\n\nKartläggning med en GPS\nTanken med OpenStreetMap är att skapa en karta utan de begränsningar andra som andra kartors copyright ger. Därför kan du inte kopiera data från andra källor. Du måste gå ut och kartlägga gatorna på egen hand.\nLyckligtvis är det väldigt kul att göra!\nDet bästa sättet är att ha en handhållen GPS. Hitta sedan ett område som inte är kartlagt ännu, gå eller cykla sedan längsmed gatorna med GPSen påslagen. Notera namnet och andra viktiga saker (kyrkor, restauranger osv.) när du passerar dem.\n\nNär du kommer hem innehåller din GPS ett 'spår' över var du har varit. Detta spår kan du ladda upp till OpenStreetMap.\n\nDen bästa typen av GPS är en som sparar sin position till loggfilen ofta (varje sekund) och har ett stort minne. Många kartläggare använder handhållna GPSer eller små bluetoothenheter. Det finns detaljerade tester av GPSer på vår wiki.\n\nLadda upp ditt spår\nNu måste du få spåret ifrån GPSen till din dator. Kanske fick du med en mjukvara med din GPS eller kanske du kan använda USB. Om inte du hittar något sätt, prova GPSBabel. Hur som helst, så vill du få ditt spår som en fil i GPX-format.\n\nSedan kan du använda 'GPS-spår'-fliken för att ladda upp ditt spår till OpenStreetMap. Att ladda upp filen är bara första steget, det kommer inte att synas på kartan automatiskt. Du måste rita och namnge vägarna själv, med ditt spår som underlag och guide.\nAnvända ditt spår\nLeta rätt på ditt uppladdade spår i 'GPS-spår'-listan och klicka på 'ändra' precis till höger om det. Potlatch kommer att starta med det spåret inladdat samt eventuella vägpunkter. Nu är du redo att börja rita!\n\nDu kan också klicka på knappen för att se alla andras GPS-spår (men inte vägpunkter) i det aktuella området. Håll nere Shift för att bara se dina spår.\nAnvända satellitfoton\nOm du inte har en GPS - inga problem. I vissa städer har vi satellitfoton som du kan använda som underlag. Satellitbilderna har Yahoo! varit vänliga nog att låta oss använda. Gå ut och notera gatunamnen och kom sedan tillbaka och lägg in informationen.\n\nOm du inte ser några satellitbilder, klicka på alternativknappen och se till att 'Yahoo!' är markerad. Om du fortfarande inte ser några bilder, är det troligen för att det inte finns några tillgängliga för din plats eller så behöver du zooma ut lite.\n\nUnder samma alternativknapp, så ser du även några andra val som en karta över Storbritannien som inte är skyddad av copyright och OpenTopoMap över USA. Dessa är speciellt utvalda eftersom vi har tillåtelse att använda dem. Kopiera inte från någon annans kartor eller flygfoton.\n\nIbland är satellitbilderna lite missplacerade från de verkliga lägena på vägar. Om du noterar detta, håll nere 'mellanslag' och dra bakgrunden tills den matchar. Lita alltid på GPS-spåren framför satellitbilder.\n\nRita vägar\nFör att rita en ny väg, börja genom att klicka på en tom plats på kartan. Sedan fortsätter du genom att klicka där du vill lägga till nya punkter av vägen. När du är klar avslutar du genom att dubbelklicka eller trycka 'Enter' och sedan klicka någon annanstans för att ta bort fokus på vägen.\n\nFör att rita en väg som startar vid en redan existerande väg, börja med att klicka på den existerande vägen för att välja den. Punkterna längs den vägen kommer att bli röda. Håll ner 'Shift' och klicka på den punkt där du vill börja den nya vägen (om det inte finns någon röd punkt, shift-klicka bara där du vill börja).\n\nKlicka på 'Spara' (nedre högra hörnet) när du är klar. Spara ofta, ifall det skulle bli problem med servern.\n\nFörvänta dig inte att dina ändringar syns omedelbart på huvudkartan. Vanligtvis tar det en timma eller två och ibland upp till en vecka.\nSkapa korsningar\nDet är viktigt att där två vägar möts, måste de dela en punkt (eller 'nod'). Ruttplanerare använder sig av den informationen för att veta var det går att svänga.\n\nPotlatch tar hand om det här, så länge du är noggrann med att klicka exakt på den väg du vill skapa en korsning med. Se efter tecken så som; när punkter blir blå, muspekaren ändras. Korsningspunkten har en svart ram.\nFlytta och radera\nDet här fungerar precis så som du förväntar dig. För att ta bort en punkt, markera den och tryck på 'Delete'. För att ta bort en hel väg, tryck 'Shift-Delete'.\n\nFör att flytta på något, är det bara att dra det med musen (du måste klicka och hålla inne knappen en kort stund före du kan dra ett objekt, så att du inte råkar flytta något av misstag).\nMer avancerade funktioner\nOm en väg har olika namn på olika sträckor, måste du dela vägen. Klicka på vägen; klicka sedan på punkten där vägen skall delas och klicka på ikonen med saxen (du kan slå ihop vägar genom att klicka med Control, eller Apple knappen på en Mac, men gör inte det med vägar som har olika namn eller typ).\n\nRondeller är verkligt svåra att rita korrekt. Men var inte orolig, Potlatch kan hjälpa till. Rita bara en grov cirkel, försäkra dig om att den sitter ihop med sig själv i ändarna. Klicka sedan på ikonen. (Ikonen kan också användas för att räta ut vägar som skall vara raka.)\nIntressepunkter\nDet första du lärde dig var hur man drar och släpper en intressepunkt. Du kan också skapa en genom att dubbel-klicka på kartan. En grön cirkel skapas. Men hur bestämmer man om det är en kyrka eller en bensinstation? Klicka på 'Taggning' ovan för att lära dig!\n\nVilken typ av väg är det?\nNär du har ritat en väg skall du tala om vad för slags väg det är. Är det en riksväg, stig eller älv? Vad heter den? Är det några speciella regler (t.ex. cykling förbjuden)?\n\nI OpenStreetMap sparas den här informationen i 'taggar'. En tag har två delar och du kan ha så många taggar du vill. Till exempel kan du lägga till highway | trunk för att säga att det är en större väg; highway | residential för en väg i ett bostadsområde eller highway | footpath för en gångstig. Om cyklar inte är tillåtna, så kan du lägga till bicycle | no. Sedan lägger du till namnet genom name | Kungsgatan.\n\nI Potlatch ser du taggarna i nedre delen av skärmen. Klicka på en existerande väg och du ser vilka taggar den har. Klicka på '+' tecknet nere till höger för att lägga till nya taggar. 'x' vid varje tagg används för att ta bort taggen.\n\nDu kan tagga hela vägar, enskilda punkter längs vägen (t.ex. en grind eller trafikljus) och andra intressepunkter.\nAnvända fördefinierade taggar\nFör att underlätta för dig har Potlatch en del fördefinierade taggar för de vanligaste behoven.\n\nVälj en väg, klicka sedan din väg genom symbolerna tills du hittar en passande. Välj det alternativ som passar bäst i menyn.\n\nDetta kommer att leda till att taggar läggs till. Några kommer att bli delvis tomma, så att du kan skriva in t.ex. vägnamn och nummer.\nEnkelriktade vägar\nKanske du vill lägga till en tagg så som oneway | yes, men hur avgör du i vilken riktning? Det finns en pil i nedre vänstra hörnet, som talar om en vägs riktning, från start till slut. Klicka på denna pil för att ändra riktning.\nAtt välja dina egna taggar\nNaturligtvis är du inte begränsad till endast de fördefinierade. Genom att använda '+'-knappen kan du använda vilka taggar som helst.\n\nDu kan se vilka taggar andra har använt i OSMdoc och det finns en lång lista med populära taggar på vår wiki kallad Map Features. Men dessa är endast förslag, inte regler. Du är fri att skapa egna taggar eller låna från andra.\n\nEftersom OpenStreetMap-data används till att framställa många olika slags kartor, kommer varje karta att använda och visa egna utvalda taggar.\nRelationer\nIbland är inte taggar tillräckligt utan du måste 'gruppera' två eller fler vägar. Kanske en sväng är förbjuden från en väg in på en annan eller 20 vägar tillsammans bildar en uppmärkt cykelrutt. Du kan göra detta med en avancerad funktion kallad 'relationer'. Lär dig mer på wikin.\n\nÅngra misstag\nDet här är ångerknappen (du kan också trycka Z) - för att ångra den sista ändringen du gjorde.\n\nDu kan gå tillbaka till en tidigare sparad version av en väg eller punkt. Välj den och klicka på dess ID (numret nere till vänster) eller tryck H (för historiken). Du kommer att se en lista av med alla som har editerat den och när. Välj den du vill gå tillbaka till och klicka på Återställ.\n\nOm du utav misstag har tagit bort en väg och sparat ändringen, tryck U (för att ångra raderingen). All borttagna vägar kommer at visas. Välj den du vill ha, lås upp genom att klicka på det röda hänglåset och spara som vanligt.\n\nTror du att någon annan har begått ett misstag? Sänd dem ett vänligt meddelande. Använd historik funktionen (H) för att välja deras namn och tryck på 'Post'.\n\nAnvänd Inspector (i 'Avancerat' menyn) för information om den aktuella vägen eller punkten.\nVanliga frågor\nHur ser jag mina vägpunkt?\nVägpunkter visas endast om du klickar 'ändra' bredvid spårets titel i 'GPS spår'. Filen måste innehålla både vägpunkter och spårlog, då servern inte kommer bry sig om någonting som endast innehåller vägpunkter.\n\nFler vanliga frågor (FAQ) om Potlatch och OpenStreetMap.\n\n\n\nArbeta snabbare\nDesto större område du arbetar med, desto mer data måste Potlatch ladda. Zooma därför in så långt som möjligt innan du klickar på 'Ändra'.\n\nStäng av 'Använd penna och handpekare' (i fönstret för inställningar) för maximal snabbhet.\n\nOm servern är långsam, kom tillbaka senare. Kolla wikin för kända problem. Ibland som på söndagkvällar är det många som jobbar och det kan gå långsamt.\n\nBe Potlatch att komma ihåg dina favorittaggar. Välj en väg eller punkt med de taggarna, tryck sedan Ctrl, Shift och ett numer mellan 1 och 9. För att sedan använda de taggarna igen, tryck bara Shift och det numret. (Potlatch kommer att komma ihåg dem på denna datorn)\n\nGör om ditt GPS-spår till en väg genom att hitta det i 'GPS-spår' listan, klicka på 'ändra'. Markera sedan 'konvertera'-rutan. Vägen kommer att vara låst (röd) så att det inte går att spara. Ändra först och klicka sedan på röda hänglåset för att låsa upp när du är redo att spara.\n\nAtt klicka på\nDra i kartan för att flytta runt den.\nDubbelklicka för att skapa en ny intressepunkt (POI).\nEnkelklicka för att starta en ny väg.\nHåll och dra i en väg eller POI för att flytta den.\nNär du ritar en väg\nDubbelklicka eller tryck Enter för att avsluta en väg.\nKlicka på en annan väg för att skapa en korsning.\nShiftklicka slutet på en annan väg för att slå ihop dem.\nNär en väg är vald\nKlicka på en punkt för att välja den.\nShift-klicka i en väg för att lägga till en ny punkt.\nShift-klicka på en punkt för att starta en ny väg där.\nControl-klicka på en annan väg för att koppla ihop dem.\n\nTangentbordskommandon\nB Lägg till en källhänvisningstag\nC Stäng ett ändringsset\nG Visa GPS-spår\nH Visa historiken\nI Visa inspector\nJ Slå ihop två korsande vägar i en punkt.\n(+Shift) Unjoin from other ways\nK Lås/lås upp den aktuella punkten/vägen\nL Visa latitud/longitud\nM Maximera kartfönstret\nP Skapa en parallell väg\nR Upprepa taggar\nS Spara (om du valt 'Ändra via spara')\nT Omvandla till en rät linje eller cirkel\nU Återkalla (visa borttagna vägar)\nX Dela en väg i två separata\nZ Ångra\n- Ta bort en punkt ifrån aktuell väg\n+ Lägg till en ny tagg\n/ Välj annan väg som delar den aktuella punkten\nDelete Ta bort en punkt\n (+Shift) Ta bort en hel väg\nReturn Avsluta ritandet av en linje\nHåll Mellanslag och dra bakgrunden\nEsc Avbryt ändringen; ladda om data från servern\n0 Ta bort alla taggar\n1-9 Välj fördefinierade taggar\n (+Shift) Välj användardefinierade taggar\n (+S/Ctrl) Definiera användartaggar\n§ eller ` Växla mellan taggrupper\n\n" - hint_drawmode: Klicka för att lägga till en punkt\n Dubbelklicka för att avsluta vägen. - hint_latlon: "lat $1\nlon $2" - hint_loading: laddar vägar - hint_overendpoint: över en slutpunkt\nklicka för att sätta fast\nshift-klicka för att slå samman - hint_overpoint: över en punkt\nklicka för att sätta fast" - hint_pointselected: En punkt är vald\n(Shift-klicka på punkten för att starta en ny väg) - hint_saving: sparar data - hint_saving_loading: laddar/sparar data - inspector: Inspektör - inspector_duplicate: Dubblett av - inspector_in_ways: I sträckor - inspector_latlon: "Lat $1\nLon $2" - inspector_locked: Låst - inspector_node_count: ($1 gånger) - inspector_not_in_any_ways: Inte på någon väg (POI) - inspector_unsaved: Osparad - inspector_uploading: (laddar upp) - inspector_way_connects_to: Förbunden med $1 vägar - inspector_way_connects_to_principal: Ansluter till $1 $2 och $3 andra $4 - inspector_way_nodes: $1 noder - inspector_way_nodes_closed: $1 noder (stängda) - loading: Laddar... - login_pwd: "Lösenord:" - login_retry: Okänt användarnamn. Vänligen försök igen. - login_title: Kunde inte logga in - login_uid: "Användarnamn:" - mail: Post - more: Mer - newchangeset: "Försök igen: Potlatch startar ett nytt ändringsset." - "no": Nej - nobackground: Ingen bakgrund - norelations: Inga relationer i nuvarande område - offset_broadcanal: Bred dragstig längs kanal - offset_choose: Välj offset (m) - offset_dual: Motortrafikled (D2) - offset_motorway: Motorväg (D3) - offset_narrowcanal: Smal dragstig längs kanal - ok: Ok - openchangeset: Öppnar ändringsset - option_custompointers: Använd penna och handpekare - option_external: "Extern lansering:" - option_fadebackground: Mattad bakgrund - option_layer_cycle_map: OSM - cykelkarta - option_layer_maplint: OSM - Maplint (fel) - option_layer_nearmap: "Australien: NearMap" - option_layer_ooc_25k: Historisk UK karta 1:25k - option_layer_ooc_7th: "Historisk UK karta: 7nd" - option_layer_ooc_npe: "Historisk UK karta: NPE" - option_layer_ooc_scotland: "UK historisk: Skottland" - option_layer_os_streetview: "UK: OS StreetView" - option_layer_streets_haiti: "Haiti: gatunamn" - option_layer_surrey_air_survey: "UK: Surrey Air Survey" - option_layer_tip: Välj bakgrund att visa - option_limitways: Varna när stora mängder data laddas - option_microblog_id: "Mikroblognamn:" - option_microblog_pwd: "Mikrobloglösenord:" - option_noname: Markera vägar utan namn - option_photo: "Foto-KML:" - option_thinareas: Använd tunnare linjer för ytor - option_thinlines: Använd tunna linjer på alla skalor - option_tiger: Markera oförändrat TIGER - option_warnings: Visa flytande varningar - point: Nod (punkt) - preset_icon_airport: Flygplats - preset_icon_bar: Bar - preset_icon_bus_stop: Busshållplats - preset_icon_cafe: Kafé - preset_icon_cinema: Biograf - preset_icon_convenience: Närköp - preset_icon_disaster: Haiti byggnad - preset_icon_fast_food: Snabbmat - preset_icon_ferry_terminal: Färja - preset_icon_fire_station: Brandstation - preset_icon_hospital: Sjukhus - preset_icon_hotel: Hotell - preset_icon_museum: Museum - preset_icon_parking: Parkering - preset_icon_pharmacy: Apotek - preset_icon_place_of_worship: Plats för tillbedjan - preset_icon_police: Polisstation - preset_icon_post_box: Brevlåda - preset_icon_pub: Pub - preset_icon_recycling: Återvinning - preset_icon_restaurant: Restaurang - preset_icon_school: Skola - preset_icon_station: Järnvägsstation - preset_icon_supermarket: Snabbköp - preset_icon_taxi: Taxihållplats - preset_icon_telephone: Telefon - preset_icon_theatre: Teater - preset_tip: Välj från en meny med fördefinierade taggar som beskriver $1 - prompt_addtorelation: Lägg till $1 till en relation - prompt_changesetcomment: "Ange en beskrivning av dina ändringar:" - prompt_closechangeset: Stäng ändringsset $1 - prompt_createparallel: Skapa parallell väg - prompt_editlive: Ändra direkt - prompt_editsave: Ändra via spara - prompt_helpavailable: Ny användare? Se hjälp nere till vänster. - prompt_launch: Öppna extern URL - prompt_live: I Live-läget kommer alla ändringar att sparas direkt i OpenStreetMap databasen. Detta rekommenderas inte för nybörjare. Är du säker på att du vill fortsätta? - prompt_manyways: Det här området är mycket detaljerat och det kommer ta lång tid att ladda. Vill du zooma in? - prompt_microblog: Posta till $1 ($2 kvar) - prompt_revertversion: "Gå tillbaka till en tidigare version:" - prompt_savechanges: Spara ändringar - prompt_taggedpoints: Några av punkterna i den här vägen är taggade eller i en relation. Vill du verkligen ta bort den? - prompt_track: Omvandla dina GPS-spår till (låsta) vägar för editering. - prompt_unlock: Lås upp genom att klicka - prompt_welcome: Välkommen till OpenStreetMap! - retry: Försök igen - revert: Återställ - save: Spara - tags_backtolist: Tillbaka till listan - tags_descriptions: Beskrivningar av '$1' - tags_findatag: Hitta en tagg - tags_findtag: Hitta tagg - tags_matching: Populära taggar matchande '$1' - tags_typesearchterm: "Skriv ett ord för att leta efter:" - tip_addrelation: Lägg till i en relation - tip_addtag: Lägg till en ny etikett (tag) - tip_alert: Ett fel har inträffat - klicka för detaljer - tip_anticlockwise: Vägen är rund, riktad moturs - klicka för att vända riktning - tip_clockwise: Vägen är rund, riktad medurs - klicka för att vända riktning - tip_direction: Vägens riktning - klicka för att vända vägen - tip_gps: Visa GPS-spår (G) - tip_noundo: Finns inget att ångra - tip_options: Ändra inställningar (välj bakgrundskarta) - tip_photo: Ladda foton - tip_presettype: Välj vilka typer av inställningar som syns i menyn. - tip_repeattag: Kopiera etiketterna (taggarna) från den senast valda vägen (R) - tip_revertversion: Välj version som ska användas - tip_selectrelation: Addera till den valda rutten - tip_splitway: Dela upp vägen i två delar vid den valda punkten (x) - tip_tidy: Snygga upp punkter i väg (T) - tip_undo: Ångra $1 (Z) - uploading: Laddar upp... - uploading_deleting_pois: Raderar POI - uploading_deleting_ways: Raderar vägar - uploading_poi: Laddar upp POI $1 - uploading_poi_name: Laddar upp POI $1,$2 - uploading_relation: Laddar upp relation $1 - uploading_relation_name: Laddar upp relationen $1,$2 - uploading_way: Laddar upp väg $1 - uploading_way_name: Laddar upp väg $1, $2 - warning: Varning! - way: Väg - "yes": Ja diff --git a/config/potlatch/locales/tl.yml b/config/potlatch/locales/tl.yml deleted file mode 100644 index 9f316c0ce..000000000 --- a/config/potlatch/locales/tl.yml +++ /dev/null @@ -1,228 +0,0 @@ -# Messages for Tagalog (Tagalog) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: AnakngAraw -tl: - a_poi: $1 ang isang POI - a_way: $1 ang isang daanan - action_addpoint: nagdaragdag ng isang buko sa dulo ng isang daanan - action_cancelchanges: hindi itinutuloy ang mga pagbabago sa - action_changeway: mga pagbabago sa isang daan - action_createparallel: lumilikha ng kaagapay na mga daanan - action_createpoi: lumilikha ng isang tuldok na makagigiliwan - action_deletepoint: nagbubura ng isang tuldok - action_insertnode: nagdaragdag ng isang buko papasok sa isang daanan - action_mergeways: pinagsasanib ang dalawang mga daanan - action_movepoi: inililipat ang isang POI - action_movepoint: naglilipat ng isang tuldok - action_moveway: naglilipat ng isang daan - action_pointtags: nagtatakda ng mga tatak sa ibabaw ng isang tuldok - action_poitags: nagtatakda ng mga tatak sa ibabaw ng isang tuldok na makagigiliwan - action_reverseway: binabaligtad ang isang daanan - action_revertway: ibinabalik sa dati ang isang daanan - action_splitway: binibiyak ang isang daanan - action_waytags: nagtatakda ng mga tatak sa ibabaw ng isang daanan - advanced: Mas masulong - advanced_close: Isara ang pangkat ng pagbabago - advanced_history: Kasaysayan ng daanan - advanced_inspector: Tagapagsiyasat - advanced_maximise: Palakihin ang bintana - advanced_minimise: Paliitin ang bintana - advanced_parallel: Magkaagapay na daanan - advanced_tooltip: Mas masulong na mga galaw ng pamamatnugot - advanced_undelete: Huwag burahin - advice_bendy: Masyadong nakabaluktot upang maituwid (SHIFT upang pilitin) - advice_conflict: Salungatan ng tagapaghain - maaaring kailanganin mong subukang sagipin ulit - advice_deletingpoi: Binubura ang POI (Z upang huwag maisagawa) - advice_deletingway: Binubura ang daanan (Z upang huwag maisagawa) - advice_microblogged: Isinapanahon ang iyong katayuang $1 - advice_nocommonpoint: Hindi nagsusukob ng isang pangkaraniwang tuldok ang mga daanan - advice_revertingpoi: Ibinabalik sa huling nasagip na POI (Z upang hindi maisagawa) - advice_revertingway: Ibinabalik sa huling nasagip na daanan (Z upang huwag maisagawa) - advice_tagconflict: Hindi magkatugma ang mga tatak - mangyaring suriin (Z upang hindi maisagawa) - advice_toolong: Napakahaba upang maikandado - mangyaring biyakin sa mas maikling mga daanan - advice_uploadempty: Walang maikakargang papaitaas - advice_uploadfail: Inihinto ang papaitaas na pagkakarga - advice_uploadsuccess: Matagumpay na naikargang paitaas ang lahat ng dato - advice_waydragged: Kinaladkad ang daanan (Z upang huwag maisagawa) - cancel: Huwag ituloy - closechangeset: Isinasara ang pangkat ng pagbabago - conflict_download: Ikargang paibaba ang kanilang bersyon - conflict_overwrite: Patungan ang kanilang bersyon - conflict_poichanged: Magmula noong magsimula kang mamatnugot, mayroon nang ibang tao na nagbago ng tuldok na $1$2. - conflict_relchanged: Magmula noong magsimula kang mamatnugot, mayroon nang ibang tao na nagbago ng ugnayang $1$2. - conflict_visitpoi: Pindutin ang 'OK' upang maipakita ang tuldok. - conflict_visitway: Pindutin ang 'OK' upang maipakita ang daan. - conflict_waychanged: Magmula noong magsimula kang mamatnugot, mayroon nang ibang tao na nagbago ng daanang $1$2. - createrelation: Lumikha ng isang bagong ugnayan - custom: "Pasadya:" - delete: Burahin - deleting: binubura - drag_pois: Kaladkarin at ihulog ang mga tuldok na makagigiliwan - editinglive: Buhay na pamamatnugot - editingoffline: Pamamatnugot habang wala sa Internet - emailauthor: \n\nMangyaring padalhan ng e-liham si richard@systemeD.net na may isang ulat ng sira, na sinasabi kung ano ang ginagawa mo noong oras na iyon. - error_anonymous: Hindi ka maaaring makipag-ugnayan sa isang hindi nagpapakilalang tagapagmapa. - error_connectionfailed: Paumanhin - nabigo ang ugnay sa tagapaghain ng OpenStreetMap. Hindi nasagip ang anumang kamakailang mga pagbabago.\n\nNais mo bang subukang muli? - error_microblog_long: "Nabigo ang pagpapaskil sa $1:\nKodigo ng HTTP: $2\nMensahe ng kamalian: $3\nKamalian ng $1: $4" - error_nopoi: Hindi matagpuan ang Tuldok na Kagigiliwan (POI) (marahil inasay mo ito?) kaya't hindi ko maibalik sa dati. - error_nosharedpoint: Ang mga daanang $1 ay $2 hindi na nag-aamutan ng isang pangkaraniwang tuldok, kaya't hindi ko mabuo ulit mula sa pagkakahiwa. - error_noway: Hindi matagpuan ang daanang $1 (marahil inasay mo ito?) kaya't hindi ko maibalik sa dati. - error_readfailed: Paumanhin - hindi tumugon ang tagapaghain ng OpenStreetMap noong humingi ng dato.\n\nNais mo bang subukang muli? - existingrelation: Idagdag sa isang umiiral na kaugnayan - findrelation: Maghanap ng isang kaugnayan na naglalaman ng - gpxpleasewait: Mangyaring maghintay habang isinasagawa ang bakas ng GPX. - heading_drawing: Pagguhit - heading_introduction: Pagpapakilala - heading_pois: Pagsisimula - heading_quickref: Pangmabilisang sanggunian - heading_surveying: Nagsisiyasat - heading_tagging: Nagtatatak - heading_troubleshooting: Nagsusuri ng suliranin - help: Tulong - hint_drawmode: pindutin upang idagdag ang pandulong guhit na tuldok\npindutin ng dalawang ulit/Bumalik\nsa - hint_latlon: "latitud $1\nlonghitud $2" - hint_loading: ikinakarga ang dato - hint_overendpoint: sa ibabaw ng dulong-tuldok ($1)\npindtuin upang pagsamahin\nshift-pindtuin upang pagsanibin - hint_overpoint: sa ibabaw ng tuldok ($1)\npindutin upang pagsamahin - hint_pointselected: napili ang tuldok\n(magpalit-pindutin ang tuldok upang\nmagsimula ng bagong guhit) - hint_saving: sinasagip ang dato - hint_saving_loading: ikinakarga/sinasagip ang dato - inspector: Tagapagsiyasat - inspector_duplicate: Kagaya ng - inspector_in_ways: Sa mga daang - inspector_latlon: "Latitud $1\nLonghitud $2" - inspector_locked: Nakakandado - inspector_node_count: ( $1 mga ulit) - inspector_not_in_any_ways: Hindi sa anumang mga paraan (tuldok na makagigiliwan) - inspector_unsaved: Hindi nasagip - inspector_uploading: (ikinakargang papaitaas) - inspector_way_connects_to: Umuugnay sa $1 mga daanan - inspector_way_connects_to_principal: Umuugnay sa $1 $2 at $3 iba pang $4 - inspector_way_nodes: $1 mga buko - inspector_way_nodes_closed: $1 mga buko (nakasara) - loading: Ikinakarga... - login_pwd: "Hudyat:" - login_retry: Hindi nakilala ang paglagda mo sa sityo. Mangyaring subukan uli. - login_title: Hindi makalagda - login_uid: "Pangalan ng tagagamit:" - mail: Liham - more: Marami pa - newchangeset: "Pakisubukan ulit: Magsisimula ang potlatch ng isang bagong pangkat ng pagbabago." - "no": Hindi - nobackground: Walang panlikuran - norelations: Walang mga kaugnayan sa pangkasulukuyang lugar - offset_broadcanal: Maluwang na paralan na landas ng panghilang bangka - offset_choose: Piliin ang pambawi ng kakulangan (m) - offset_dual: Pandalawahang daanan ng karuwahe (D2) - offset_motorway: Daanan ng sasakyang may motor (D3) - offset_narrowcanal: Makitid na paralan na landas ng panghilang bangka - ok: Sige - openchangeset: Binubuksan ang pangkat ng pagbabago - option_custompointers: Gamitin ang panulat at mga panturo ng kamay - option_external: "Paglulunsad na panlabas:" - option_fadebackground: Pakupasin ang panlikuran - option_layer_cycle_map: OSM - mapa ng ikot - option_layer_maplint: OSM - Maplint (mga kamalian) - option_layer_nearmap: "Australya: NearMap" - option_layer_ooc_25k: "Makasaysayang Nagkakaisang Kaharian: 1:25k" - option_layer_ooc_7th: "Makasaysayang Nagkakaisang Kaharian: ika-7" - option_layer_ooc_npe: "Makasaysayang Nagkakaisang Kaharian: NPE" - option_layer_ooc_scotland: "Makasaysayang Nagkakaisang Kaharian: Eskosya" - option_layer_os_streetview: "Nagkakaisang Kaharian: Tanawin ng Kalsada ng OS" - option_layer_streets_haiti: "Haiti: pangalan ng mga lansangan" - option_layer_surrey_air_survey: "Nagkakaisang Kaharian: Pagtatanung-tanong sa Panghimpapawid na Karuwahe" - option_layer_tip: Piliin ang panlikurang ipapakita - option_limitways: Bigyan ng babala kapag nagkakarga ng maraming mga dato - option_microblog_id: "Pangalan ng maliitang blog:" - option_microblog_pwd: "Hudyat sa maliitang blog:" - option_noname: Pagliwanagin ang mga kalsadang walang pangalan - option_photo: "Larawang KML:" - option_thinareas: Gumamit ng mas maninipis na mga guhit para sa mga lugar - option_thinlines: Gumamit ng manipis na mga guhit para sa lahat ng mga sukat - option_tiger: Pagliwanagin ang hindi nabagong TIGRE - option_warnings: Ipakita ang lumulutang na mga babala - point: Tuldok - preset_icon_airport: Paliparan - preset_icon_bar: Tindahang Inuman ng Alak - preset_icon_bus_stop: Hintuan ng Bus - preset_icon_cafe: Kapihan - preset_icon_cinema: Sinehan - preset_icon_convenience: Tindahang maginhawa - preset_icon_disaster: Gusali ng Hayti - preset_icon_fast_food: Kainang pangmadalian - preset_icon_ferry_terminal: Barkong pantawid - preset_icon_fire_station: Himpilan ng bumbero - preset_icon_hospital: Ospital - preset_icon_hotel: Hotel - preset_icon_museum: Museo - preset_icon_parking: Paradahan - preset_icon_pharmacy: Botika - preset_icon_place_of_worship: Sambahan - preset_icon_police: Himpilan ng pulis - preset_icon_post_box: Kahon ng Liham - preset_icon_pub: Pangmadlang Bahay - preset_icon_recycling: Muling paggamit - preset_icon_restaurant: Kainan - preset_icon_school: Paaralan - preset_icon_station: Himpilan ng tren - preset_icon_supermarket: Malaking Pamilihan - preset_icon_taxi: Ranggo ng taksi - preset_icon_telephone: Telepono - preset_icon_theatre: Tanghalan - preset_tip: Pumili mula sa isang talaan ng paunang itinakdang mga tatak na naglalarawan ng $1 - prompt_addtorelation: Idagdag ang $1 sa isang ugnayan - prompt_changesetcomment: "Magpasok ng isang paglalarawan ng mga pagbabago mo:" - prompt_closechangeset: Isara ang pangkat ng pagbabagong $1 - prompt_createparallel: Lumikha ng kaagapay na daan - prompt_editlive: Buhay na pamamatnugot - prompt_editsave: Mamatnugot na may pagsagip - prompt_helpavailable: Bagong tagagamit? Tumingin sa pang-ilalim na kaliwa para sa saklolo. - prompt_launch: Ilunsad ang panlabas na URL - prompt_live: Sa pamamaraang buhay, ang bawat bagay na binabago mo ay kaagad na sasagipin sa loob ng kalipunan ng dato ng OpenStreetMap - hindi ito iminumungkahi para sa mga nagsisimula pa lamang. Nakatitiyak ka ba? - prompt_manyways: Talagang madetalye ang pook na ito at mangangailangan ng isang matagal na panahon upang maikarga. Mas nanaisin mo bang lumapit? - prompt_microblog: Ipaskil sa $1 ($2 ang natitira pa) - prompt_revertversion: "Manumbalik sa isang mas maagang nasagip na bersyon:" - prompt_savechanges: Sagipin ang mga pagbabago - prompt_taggedpoints: Ilan sa mga tuldok na nasa daang ito ay natatakan o nasa loob ng mga ugnayan. Burahin talaga? - prompt_track: Gawing mga daan ang bakas ng GPS - prompt_unlock: Pindutin upang maging hindi nakakandado - prompt_welcome: Maligayang pagdating sa OpenStreetMap! - retry: Subukan uli - revert: Ibalik sa dati - save: Sagipin - tags_backtolist: Bumalik sa talaan - tags_descriptions: Mga paglalarawan ng '$1' - tags_findatag: Maghanap ng isang tatak - tags_findtag: Hanapin ang tatak - tags_matching: Tanyag na mga tatak na tumutugma sa '$1' - tags_typesearchterm: "Magmakinilya ng isang salitang hahanapin:" - tip_addrelation: Idagdag sa isang ugnayan - tip_addtag: Magdagdag ng isang bagong tatak - tip_alert: Naganap ang isang kamalian - pindutin para sa mga detalye - tip_anticlockwise: Daanang pabilog na hindi sumusunod sa gawi ng pag-ikot ng kamay ng orasan - pindutin upang baligtarin - tip_clockwise: Daang pabilog na sumusunod sa gawi ng pag-ikot ng kamay ng orasan - pindutin upang baligtarin - tip_direction: Patutunguhan ng daanan - pindutin upang baligtarin - tip_gps: Ipakita ang mga bakas ng GPS (G) - tip_noundo: Walang maibabalik sa dati - tip_options: Itakda ang mga mapagpipilian (piliin ang panlikuran ng mapa) - tip_photo: Ikarga ang mga litrato - tip_presettype: Piliin ang inaalok na uri ng mga paunang mga pagtatakda na nasa loob ng talaan. - tip_repeattag: Ulitin ang mga tatak mula sa nauna nang napiling daanan (R) - tip_revertversion: Piliin ang petsang pagpapanumbalikan - tip_selectrelation: Idagdag sa napiling tumbok - tip_splitway: Hatiin ang daan doon sa napiling tuldok (X) - tip_tidy: Linisin ang mga tuldok sa daanang (T) - tip_undo: Ibalik sa dati ang $1 (Z) - uploading: Ikinakarga... - uploading_deleting_pois: Binubura ang mga tuldok na makagigiliwan - uploading_deleting_ways: Binubura ang mga daan - uploading_poi: Ikinakargang papaitaas ang tuldok na makagigiliwan na $1 - uploading_poi_name: Ikinakargang papaitaas ang tuldok na makagigiliwan na $1, $2 - uploading_relation: Ikinakargang papaitaas ang kaugnayang $1 - uploading_relation_name: Ikinakargang papaitaas ang kaugnayang $1, $2 - uploading_way: Ikinakargang papaitaas ang daan na $1 - uploading_way_name: Ikinakargang papaitaas ang daan na $1, $2 - warning: Babala! - way: Daan - "yes": Oo diff --git a/config/potlatch/locales/tr.yml b/config/potlatch/locales/tr.yml deleted file mode 100644 index 2a7bb12cb..000000000 --- a/config/potlatch/locales/tr.yml +++ /dev/null @@ -1,207 +0,0 @@ -# Messages for Turkish (Türkçe) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Alerque -# Author: Katpatuka -# Author: SalihB -tr: - a_poi: "Etiket: $1" - a_way: "yol: $1" - action_addpoint: yolun sonuna bir nokta ekleniyor - action_cancelchanges: "iptal ediliyor:" - action_changeway: yolun değişiklikleri - action_createparallel: paralel yollar oluşturuluyor - action_createpoi: POI oluşturuluyor - action_deletepoint: bir nokta siliniyor - action_insertnode: yola bir nokta ekleniyor - action_mergeways: iki yol birleştiriliyor - action_movepoi: POI taşınıyor - action_movepoint: nokta taşınıyor - action_moveway: yol taşınıyor - action_pointtags: noktadaki etiketler ayarlanıyor - action_poitags: Etiketin verileri ayarlanıyor - action_reverseway: yol tersine çevriliyor - action_revertway: yol geri dönülüyor - action_splitway: yol bölünüyor - action_waytags: yoldaki parametreler düzenleniyor - advanced: Gelişmiş - advanced_close: Değişiklik takımını kapat - advanced_history: Yolun geçmişi - advanced_inspector: Ayrıntı - advanced_maximise: Ekranı kapla - advanced_minimise: Simge durumuna küçült - advanced_parallel: Paralel yolu - advanced_tooltip: Gelişmiş düzenleme işlemleri - advanced_undelete: "Geri al: sil" - advice_conflict: Sununcu ile çakışması - belki bir daha kaydetmen lazım - advice_deletingpoi: POI siliniyor (Ger almak için Z) - advice_deletingway: Yol siliniyor (geri almak için Z) - advice_nocommonpoint: Yolların ortak noktası yok - advice_revertingpoi: Etiket son kaydedilen şekline dönülüyor (geri almak için Z) - advice_revertingway: Yol son kaydedilen şekline geri dönülüyor (geri almak için Z) - advice_tagconflict: "Parametreler eşleşmiyor - lütfen kontrol edin (Geri almak için: Z)" - advice_toolong: Kilidi kaldırmak için yol fazla uzun - lütfen önce daha kısa yollara ayır - advice_uploadempty: Gönderilecek hiç bir şey yok - advice_uploadfail: Gönderme durduruldu - advice_uploadsuccess: Bütün veri başarıyla gönderildi - advice_waydragged: Yol taşındı (geri almak için Z'ye bas) - cancel: Vazgeç - closechangeset: Değişiklik takımı kapatılıyor - conflict_download: Onların sürümünü getir - conflict_overwrite: Öbür sürümünün üzerinde yaz - conflict_poichanged: Senin düzenlemenin başladıktan sonra başka birisi nokta $1$2 değiştirmiş. - conflict_relchanged: Birisi senin düzenlediğin $1$2 ilişkisini değiştirdi. - conflict_waychanged: Birisi sizin düzenlediğiniz $1$2 yolunu değiştirdi. - createrelation: Yeni bir ilişki yarat - custom: "Özel:" - delete: Sil - deleting: siliniyor - drag_pois: Etiketleri sürükle-bırak - editinglive: Canlı düzenleniyor - editingoffline: Çevrimdışı düzenleniyor - emailauthor: \n\nLütfen bu hata konusunda richard\@systemeD.net'e bir e.posta at - error_anonymous: Anonim haritacılarla iletişime geçemezsin. - error_connectionfailed: Maalesef OpenStreetMap sunucusuyla bağlantı koptu. Son değişiklikler kaydedilmedi.\n\nBir daha denemek ister misin? - error_microblog_long: "$1'ün yüklenmesi başarsız oldu:\nHTTP kodu: $2\nHata mesajı: $3\n$1 hata: $4" - error_nopoi: POI bulunamadı (belki başka bir yere taşıdınız), bundan dolayı geri alamıyorum. - error_nosharedpoint: $1 ve $2 yollarının paylaştıkları ortak bir nokta artık yok, bu yüzden bölmeyi geri alamıyorum. - error_noway: $1 yolu bulunamıyor (engellenmiş olabilir misiniz?) bu yüzden geri alamıyorum. - error_readfailed: Üzgünüz - OSM sunucusu yanıt vermedi.\n\nYeniden denensin mi? - existingrelation: Mevcut bir ilişkiye ekle - findrelation: İçeren bir ilişki bul - gpxpleasewait: GPX izi işlenirken lütfen biraz bekleyin - heading_drawing: Çizim - heading_introduction: Tanıtım - heading_pois: Başlarken - heading_quickref: Kılavuz - heading_surveying: Arazi etüdü - heading_tagging: Etiketlemek - heading_troubleshooting: Sorun giderme - help: Yardım - hint_drawmode: yeni nokta için tıkla\nçizgi sona ermek için\nçift tıkla/ENTER bas - hint_latlon: "enlem $1\nboylam $2" - hint_loading: yollar yükleniyor - hint_overendpoint: yolun son noktası\nbağlamak için tıkla\nbirleştirmek için shift-tıkla - hint_overpoint: noktanın üzerinde ($1)\nbağlanmak için tıklayın - hint_pointselected: nokta seçili\n(shift-tıkla yeni cizgi\nbaşlatmak için) - hint_saving: veriler kaydediliyor - hint_saving_loading: Veri alınıyor/kaydediliyor - inspector: Denetçi - inspector_duplicate: "Çift:" - inspector_latlon: "Enlem $1\nBoylam $2" - inspector_locked: Kilitli - inspector_unsaved: Kaydedilmemiş - inspector_uploading: (yükleniyor) - inspector_way_connects_to: $1 yol bağlı - inspector_way_nodes: $1 nokta - inspector_way_nodes_closed: $1 noktalar (kapalı) - loading: Yükleniyor... - login_pwd: "Şifre:" - login_retry: Girişin site tarafından tanınmadı. Lütfen tekrar deneyin. - login_title: Giriş yapılamadı - login_uid: "Kullanıcı adı:" - mail: E-posta - more: Daha fazla - newchangeset: "Lütfen tekrar dene: Potlatch yeni bir değişiklik takımı başlatacaktır." - "no": Hayır - nobackground: Arkaplan yok - norelations: Çalışılan alanda ilişki yok - offset_choose: Mesafe seç (m) - offset_dual: Çift şeritli yol (D2) - offset_motorway: Otoyolu (D3) - ok: Tamam - openchangeset: Değişiklik takımı açılıyor - option_custompointers: Kalem ve el işareti kullan - option_fadebackground: Arkaplanı saydamlaştır - option_layer_cycle_map: OSM - Bisiklet yolu haritası - option_layer_maplint: OSM - Maplint (hataları) - option_layer_nearmap: "Avustralya: NearMap" - option_layer_ooc_scotland: İskoçya (tarihsel) - option_layer_os_streetview: "İngiltere: OS Sokak Görünümü" - option_layer_streets_haiti: "Haiti'de: sokak adları" - option_layer_tip: Arkafonu seç - option_limitways: Eğer fazla veri indirilirse beni uyar - option_noname: Adsız yolları vurgulansın - option_photo: "Foto KML:" - option_thinareas: Alanlarda ince çizgiler kullan - option_thinlines: Tüm ölçeklerde ince çizgiler kullan - option_tiger: Değiştirilmemiş TIGER verileri vurgula (ABD) - option_warnings: Uyarıları göster - point: Nokta - preset_icon_airport: Havaalanı - preset_icon_bar: Bar - preset_icon_bus_stop: Otobüs durağı - preset_icon_cafe: Cafe - preset_icon_cinema: Sinema - preset_icon_convenience: Market - preset_icon_disaster: "Haiti'de: bina" - preset_icon_fast_food: Büfe / lokanta - preset_icon_ferry_terminal: Feribot - preset_icon_fire_station: İtfaiye - preset_icon_hospital: Hastane - preset_icon_hotel: Hotel - preset_icon_museum: Müze - preset_icon_parking: Park alanı - preset_icon_pharmacy: Eczane - preset_icon_place_of_worship: İbadethane - preset_icon_police: Polis - preset_icon_post_box: Posta kutusu - preset_icon_pub: Birahane - preset_icon_recycling: Geri dönüşüm - preset_icon_restaurant: Restaurant - preset_icon_school: Okul - preset_icon_station: Tren istasyonu - preset_icon_supermarket: Süpermarket - preset_icon_taxi: Taksi durağı - preset_icon_telephone: Telefon - preset_icon_theatre: Tiyatro - prompt_addtorelation: ilişkiye $1 ekle - prompt_changesetcomment: Değişiklikleriniz için bir açıklama yazın - prompt_closechangeset: değişiklik takımı $1 kapat - prompt_createparallel: Yolunun paraleli oluştur - prompt_editlive: Canlı düzenle - prompt_editsave: Kaydet ile düzenle - prompt_helpavailable: Yeni kullanıcı mısın? Yardıma bak. - prompt_launch: Dış bağlantıyı başlat - prompt_manyways: Bu alan çok detaylı ve yüklemesi uzun sürebilir. Yakınlaştırılsın mı? - prompt_revertversion: "Daha önce kaydedilmiş bir sürümüne dön:" - prompt_savechanges: Değişiklikleri kaydet - prompt_taggedpoints: Bu yol üzerindeki bazı noktalara parametreler verilmiş veya bağlantılarda kullanılıyor. Yine de silinsin mi? - prompt_track: GPS izini, düzenlemek için (kilitli) bir yola dönüştür. - prompt_unlock: Kilidi açmak için tıkla - prompt_welcome: OpenStreetMap'e Hoşgeldin! - retry: Tekrar dene - revert: Geri al - save: Kaydet - tags_backtolist: Listeye geri dön - tags_findatag: Parametreyi bul - tags_findtag: Etiketi bul - tags_typesearchterm: "Aramak için bir sözcük yazın:" - tip_addrelation: Bir ilişkiye ekle - tip_addtag: Yeni parametre ekle - tip_alert: Bir hata oluştu - ayrıntılar için tıkla - tip_anticlockwise: saatin ters yönünde dairesel yol - tersine dönmek için tıkla - tip_clockwise: saat yönünde dairesel yol - tersine dönmek için tıkla - tip_direction: Yolun yönü - ters yöne değiştirmek için tıkla - tip_gps: GPS izlerini göster (G) - tip_noundo: Geri alınacak bir şey yok - tip_options: Ayarları değiştir (harita arka planını seç) - tip_photo: Fotoğrafları yükle - tip_presettype: Menüde sunulan türleri seç - tip_repeattag: Parametreleri bir önceki seçtiğin yoldan kopyala (R) - tip_revertversion: Geri dönülecek sürümü seç - tip_selectrelation: Seçili rotaya ekle - tip_splitway: Seçtiğin noktada yolu böl (X) - tip_tidy: Doğru çizgi oluştur (kapalı bir yoldan bir daire oluşturulacak) - tip_undo: $1 Geri Al (Z) - uploading: Gönderiliyor... - uploading_deleting_pois: Etiketler siliniyor - uploading_deleting_ways: Yolları siliniyor - uploading_poi: $1 etiketi yükleniyor - uploading_poi_name: $1, $2 etiketler yükleniyor - uploading_relation: $1 ilişki yükleniyor - uploading_way: $1 yol yükleniyor - uploading_way_name: $1, $2 yol yükleniyor - warning: Uyarı! - way: Yol - "yes": Evet diff --git a/config/potlatch/locales/uk.yml b/config/potlatch/locales/uk.yml deleted file mode 100644 index 70667a8db..000000000 --- a/config/potlatch/locales/uk.yml +++ /dev/null @@ -1,235 +0,0 @@ -# Messages for Ukrainian (Українська) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: AS -# Author: Ahonc -# Author: Andygol -# Author: KEL -# Author: Prima klasy4na -uk: - a_poi: $1 об’єкта (POI) - a_way: $1 лінію - action_addpoint: додавання точки в кінець лінії - action_cancelchanges: скасування змін до - action_changeway: зміни в лінії - action_createparallel: створення паралельних ліній - action_createpoi: створення об’єкту (POI) - action_deletepoint: вилучення точки - action_insertnode: додавання точки до лінії - action_mergeways: з’єднання двох ліній - action_movepoi: пересування об’єкта (POI) - action_movepoint: пересування точки - action_moveway: пересування лінії - action_pointtags: встановлення теґів для точки - action_poitags: встановлення теґів для об’єкта (POI) - action_reverseway: зміна напрямку лінії - action_revertway: повернення лінії - action_splitway: розділення лінії - action_waytags: встановлення теґів на лінію - advanced: Меню - advanced_close: Закрити набір змін - advanced_history: Історія лінії - advanced_inspector: Інспектор - advanced_maximise: Розгорнути вікно - advanced_minimise: Згорнути вікно - advanced_parallel: Паралельна лінія - advanced_tooltip: Розширені дії з редагування - advanced_undelete: Відновити - advice_bendy: Дуже вигнуто (SHIFT — спрямити) - advice_conflict: Конфлікт на сервері — можливо, потрібно зберегти знов - advice_deletingpoi: Вилучення об’єкта (POI) (Z — відміна) - advice_deletingway: Вилучення лінії (Z — відміна) - advice_microblogged: Оновлено ваш статус $1 - advice_nocommonpoint: Лінії не мають спільну точку - advice_revertingpoi: Повернення до останнього збереженого об’єкту (POI) (Z для відміни) - advice_revertingway: Повернення до останньої збереженої лінії (Z — відміна) - advice_tagconflict: Теґи не збігаються — перевірте (Z для відміни) - advice_toolong: Занадто довга лінія — розділіть її на коротші - advice_uploadempty: Нема чого завантажувати на сервер - advice_uploadfail: Завантаження даних на сервер зупинено - advice_uploadsuccess: Всі дані успішно завантажено на сервер - advice_waydragged: Лінію пересунуто (Z для відміни) - cancel: Скасувати - closechangeset: Закриття набору правок - conflict_download: Завантажити чужу версію - conflict_overwrite: Замінити чужі версії - conflict_poichanged: Після того, як ви почали редагування, хтось змінив точку $1$2. - conflict_relchanged: Після того, як ви почали правити, хтось змінив зв’язок $1$2. - conflict_visitpoi: Клацніть «Так», щоб побачити точку. - conflict_visitway: Натисніть «Так», щоб показати лінію. - conflict_waychanged: Після того, як ви почали правити, хтось змінив лінію $1$2. - createrelation: Створити новий Зв’язок - custom: "Спеціальний:" - delete: Вилучити - deleting: вилучення - drag_pois: Перетягніть об’єкт (POI) на мапу - editinglive: Редагування вживу - editingoffline: Редагування із збереженням - emailauthor: "\\n\\nБудь ласка, відправте повідомлення про помилку на електронну пошту: richard\\@systemeD.net, із зазначенням того, які дії ви робили." - error_anonymous: Ви не можете зв'язатись з анонімним картографом. - error_connectionfailed: Вибачте — з’єднання з сервером OpenStreetMap розірвано. Усі поточні зміни не були збережені.\n\nСпробувати ще раз? - error_microblog_long: "Надсилання до $1 неможливе:\nHTTP код: $2\nПовідомлення про помилку: $3\n$1 помилка: $4" - error_nopoi: Не можливо знайти об’єкт (POI) (можливо ви зсунулися вбік?) — не можу відмінити. - error_nosharedpoint: Лінії $1 і $2 більше не містять спільних точок, тому не можна скасувати розподілення. - error_noway: Лінія $1 не знайдена (можливо ви зсунулися в бік?), тому не можна скасувати. - error_readfailed: Вибачте — сервер OpenStreetMap не відповідає на запити про надання даних.\n\nСпробувати ще раз? - existingrelation: Додати до існуючого зв’язку - findrelation: Знайти зв’язки, що містять - gpxpleasewait: Зачекайте — обробка GPX-треку. - heading_drawing: Креслення - heading_introduction: Вступ - heading_pois: Початок роботи - heading_quickref: Короткий довідник - heading_surveying: Огляд - heading_tagging: Встановлення теґів - heading_troubleshooting: Вирішення проблем - help: Довідка - help_html: "Ласкаво просимо до Potlatch\nPotlatch — це простий у використанні редактор для OpenStreetMap. Кресліть дороги, стежки, визначні пам'ятки і магазини, обробляючи ваші GPS-дані, супутникові знімки і старі мапи.\n\nЦі довідкові сторінки ознайомлять вас з основами використання Potlatch і вкажуть де можна дізнатися додаткові відомості. Гортайте сторінки, натискаючи на назви розділів в шапці цього довідника.\n\nКоли ви захочете закрити довідник — клацніть будь-де поруч з вікном довідника.\n\n\n\nКорисні речі, які треба знати\nНе копіюйте інформацію з інших мап!\n\nЯкщо ви обираєте «Редагування вживу» — будь-які зміни, які ви здійснюєте, надсилаються на сервер до бази даних відразу, як тільки ви їх зробите. Якщо вам подобається багато правити та доопрацьовувати ваші правки на ходу — скористуйтесь «Правкою із збереженням», у цьому разі зміни будуть надіслані на сервер тільки після того, як ви натиснете «Зберегти».\n\nБудь-які правки з’являються на мапі через деякий час (годину або дві, чи навіть через тиждень). Не все буде показано на мапі — це зроблено для того щоб вона на виглядала заплутано. Так як OpenStreetMap — відкритий проект, інші мають змогу створювати власні (спеціальні) мапи на його основі, наприклад: OpenCycleMap (Відкриті велосипедні мапи) або Мапа в стилі Midnight Commander\n\nЗапам’ятайте їх, гарну мапу (з добре позначеними плавними лініями) та схему (яка дозволяє перевірити, що дороги з’єднуються на перехрестях).\n\nХіба ми не говорили про те, що не треба копіювати з інших мап?\n\n\nДізнайтеся більше:\nКерівництво по роботі з Potlatch.\nСписки розсилки\nОнлайн Чат (Жива допомога)\nФорум\nВікі\nСирці Potlatch\n\n\n\nЗ чого розпочати\nОтже ви маєте відкритий Potlatch, клацніть «Редагування із збереженням» щоб почати правити мапу.\n\nТепер ви маєте змогу почати креслити мапу. Найпростішим завданням для початку буде нанесення об’єктів (POI). Це можуть бути церкви, залізничні станції, стоянки… будь-що за вашим бажанням.\n\nПеретягуйте об’єкти на мапу\nЦе робити дуже просто. Ви можете бачити більш вживані об’єкти (POI) знизу, відразу під мапою. Перетягуйте їх на мапу у потрібне місце. Не переймайтесь тим, що ви не поставите їх у вірне місце відразу, ви можете потім перетягнути їх куди треба. Виділені об’єкти позначаються жовтим кольором.\n\nПісля того як ви зробили це, ви, можливо, забажаєте вказати назву для вашого об’єкта (зупинки, церкви, театру и т.і.). Ви побачите невеличку таблицю, як з’явиться знизу. Один з її рядків – «назва»(«name») буде мати значення – «введіть назву» («(type name here)»). Зробіть це — клацніть на клітинку та введіть назву.\n\nКлацніть в будь-якому іншому місці на мапі для зняття виділення з об’єкта, щоб показати знову панель зі значками.\n\nПросто, чи не так? Клацніть «Зберегти» («Save») в правому нижньому куті, коли закінчите.\nПересування мапою\nДля того щоб переміститись на іншу ділянку мапи — просто потягніть мапу у потрібному напрямку. Potlatch автоматично завантажить нові дані (гляньте у правий верхній кут).\n\nМи пропонували вам «Редагування із збереженням», але ви також можете обрати «Редагування вживу». Якщо ви оберете цей режим, ваші зміни будуть надсилатись на сервер відразу, як тільки ви їх зробите, отже вам не треба буде натискати на кнопку «Зберегти» («Save»). Це добре підходить для швидкої правки та заходів з картографування.\n\nНаступні кроки\nРозібрались? Чудово. Клацніть «Геодезія» («Surveying»), щоб дізнатись, як стати спарвжнім картографом.\n\nГеодезія з GPS\nІдея OpenStreetMap полягає в тому, щоб зробити мапу без обмежень, які містять мапи захищені авторським правом. В зв’язку з чим ви не можете копіювати з інших джерел, вам треба піти і обстежити вулиці самостійно. До того ж, це дуже цікаво! \nНайкращій спосіб зробити це — скористатись GPS-пристроєм. Знайдіть територію, яка ще відсутня на мапі (звісно на мапі OpenStreetMap), прогуляйтесь пішки або поїдьте на велосипеді із ввімкненим GPS. Занотуйте назви вулиць та будь-які цікаві подробиці (магазини, кафе, установи …) під час вашої прогулянки.\n\nКоли ви повернетесь до дому, ваш GPS буде мати записаний трек з усіх тих місць, де ви були. Після чого ви можете завантажити його на сервер OpenStreetMap.\n\nНайкращім типом пристроїв GPS є такі, які можуть записувати трек з певною періодичністю (кожну секунду або дві) та має достатньо місця для збереження. Більшість наших картографів використовують пристрої від Garmin або невеликі пристрої із Bluetooth. Докладніше про них можна прочитати у Вікі на сторінці Огляд GPS-приймачів\n\nЗавантаження на сервер ваших треків\nЗараз вам потрібно видобути ваш трек з GPS-пристрою. Можливо, для вашого GPS є програмне забезпечення для цього або він дозволяє вам скопіювати файли через USB. Якщо ні, спробуйте GPSBabel. У будь-якому випадку все що вам треба — щоб отриманий файл був у форматі GPX.\n\nДля завантаження вашого треку на сервер OpenStreetMap скористайтесь вкладкою «GPS-треки». Але це тільки перший крок — він не внесе змін до мапи. Вам треба накреслити ліній та дати їм назви самостійно, використовуючи трек, як орієнтир.\nВикористання треків\nВаші завантажені треки знаходяться в переліку на вкладці «GPS-треки». Клацніть «правити» справа біля нього і Potlatch запуститься завантаживши цей трек та інші точки. Тепер ви готові креслити!\n\nВи також можете натиснути на цю кнопку, щоб показати GPS-треки кожного для цієї ділянки.\nВикористання супутникових фотографій\nЯкщо у вас немає GPS, не переймайтесь. Для великих міст у нас є супутникові знімки (люб’язно надані Yahoo!) по яким ви можете креслити. Зберіть додаткову інформацію про місцевість та креслить та позначайте об’єкти та їх назви (додаткову інформацію) по знімках.\n\nЯкщо ви не бачите супутникові знімки на фоні, клацніть на кнопку налаштувань та переконайтесь, що вибрано «Yahoo!». Ви й досі не бачите їх — можливо для вашого місця розташування їх немає або вам треба зменшити масштаб.\n\nНатиснувши ту ж саму кнопку налаштувань ви можете побачити невеличкий перелік мап, на які не поширюються обмеження авторського права для Великобританії та OpenTopoMap — для США. Всі вони пройшли відбір на відповідність до нашої ліцензії, тому ви можете використовувати їх, але не копіюйте з інших мап чи аерофотознімків. (Пам’ятайте про законодавчі обмеження авторського права.)\n\nІнколи супутникові знімки трохи зсунуті вбік від того місця де насправді вони повинні бути. Якщо ви помітите таке, натисніть Пробіл та потягніть фон доки дорога на ньому не співпаде із треком. Завжди довіряйте GPS-трекам ніж супутниковим знімкам.\n\nКреслення ліній\nДля початку креслення дороги (або «лінії») просто клацніть по чистому місцю на мапі; далі — клацайте на кожному вигині лінії. Коли ви забажаєте закінчити натисніть Ввід або зробіть подвійне клацання; потім клацніть будь-де, щоб знати виділення з дороги.\n\nДля креслення лінії, що починається від іншої лінії, клацніть на цю лінію для виділення; її точки стають червоними. Тримайте SHIFT та клацніть на виділеній лінії щоб розпочати креслення нової лінії з цієї точки. (Якщо в цьому місці немає червоної точки поставте її за допомогою SHIFT-ЛК в потрібному місці!)\n\nКлацніть «Зберегти» («Save») справа знизу, коли закінчите. Зберігайте частіше, якщо зв’язок з сервером ненадійний.\n\nНе сподівайтесь на те, що ваші правки з’являться на мапі негайно. Звичайно, проходить година чи дві, або, навіть, тиждень.\nСтворення з’єднань\nЦе дуже важливо, щоб дві дороги з’єднувались та мали спільну точку (чи «вузол»). Програми-планувальники маршрутів повинні знати де треба повертати.\n\nPotlatch подбає про це до тих пір, доки ви будете ретельно клацати точно на лінію до якої треба приєднатись. Звертайте увагу на корисні ознаки: точка загориться синім, зміниться вказівник, і коли ви закінчите, з’єднання матиме чорний контур.\nПересування та вилучення\nВсе працює так як ви й очікуєте. Для вилучення точки виділіть її та натисніть Delete. Для вилучення всієї лінії — Shift-Delete.\n\nДля переміщення — просто перетягніть елемент. (Вам треба клацнути та трохи зачекати перед пересуванням лінії, це зроблено щоб уникнути випадкового пересування.)\nБільш докладно про креслення\nЯкщо дві частини лінії мають різні назви, вам треба розділити її. Клацніть на лінію; оберіть точку в якій треба розділити лінію та натисніть на значок з ножицями. (Ви також можете з’єднати лінії в одну, натиснувши CTRL та клацнувши мишею, для Mac — клавіша Apple, але не з’єднуйте дороги з різними назвами та типами.)\n\nДоволі складно накреслити правильний круг руками. Не турбуйтесь — Potlatch допоможе. Просто накреслить петлю, так щоб її кінець приєднався до початку та клацніть на значок «вирівняти» («tidy»). (Ви можете також використовувати його для випрямлення доріг.)\nОб’єкти (POI)\nСамим першим, чого ви навчились було перетягування об’єктів (POI) на мапу. Ви також можете створювати їх зробивши подвійне клацання на мапі, після чого з’явиться зелене коло. Але, як сказати про те чим воно є (магазин, банкомат)? Дивіться «Позначення теґами», щоб про це дізнатись!\n\nЩо таке тип дороги?\nПісля того як ви накреслили шлях, вам треба зазначити який він. Чи це головна дорога, чи тротуар або ріка? Як він називається? Чи він має особливі правила (наприклад «не для велосипедів»)?\n\nУ OpenStreetMap, ви можете записати це, використовуючи «теґи». Теґ складається з двох частин, ви можете зазначити стільки теґів, скільки треба. Наприклад: ви можете додати highway | trunk для позначення важливої дорги; highway | residential — дороги у жилій зоні; highway | footway — для тротуару. Якщо рух велосипедів заборонений додайте теґ bicycle | no. Додайте назву скориставшись теґом name | Market Street.\n\nТеґ в Potlatch показуються у нижній частині екрану — клацніть на існуючу дорогу, і ви побачите теґи яким вона позначена. Клацніть на «+» справа знизу для додання нового теґу. Значок «х» біля кожного теґу вилучає його.\n\nВи можете позначити всю лінію; точки на лінії (ворота чи світлофори); об’єкти (POI).\nВикористання шаблонів теґів\nДля того, щоб ви відразу влились у процес створення мапи, Potlatch має готові шаблони, що містять набори найбільш популярних теґів.\n\nВиділіть лінію, потім, клацаючи на значки виберіть потрібний. після чого виберіть найбільш підходящий варіант із меню.\n\nЦе дозволить заповнити теґи. Деякі частково залишаться порожнім, щоб ви могли самостійно вказати, наприклад: назви та номери доріг.\nДороги з одностороннім рухом\nМожливо, ви захочете додати теґ oneway | yes, але як вказати напрямок дороги? Для цього в лівому нижньому куті є стрілка, яка показує напрямок лінії, від початку до кінця. Клацніть на неї для зміни напрямку на протилежний.\nДодавання інших теґів\nЗвісно, ви не обмежені тільки шаблонами теґів. Ви можете використовувати будь-які теґи, які вам потрібні. Клацніть на «+» для цього та зазначте теґ та його значення.\n\nOSMdoc покаже вам, які теґи використовують інші; доволі докладно про популярні теґи розказано у Вікі на сторінці Елементи мапи. Але це лише рекомендації, а не правила. Ви вільні винаходити власні теґи або запозичувати у інших.\n\nТак як дані з OpenStreetMap використовуються для створення інших мап, кожна мапа може показувати теґи за власним вибором.\nЗв’язки\nІноді теґів недостатньо, і вам потрібно об’єднати в «групу» дві чи більше лінії. Можливо, поворот з однієї дороги на іншу заборонений або 20 ліній разом утворюють велосипедний маршрут. Ви можете зробити це за допомогою вдосконаленої функції, яка називається «Зв’язки». Дивись докладніше у Вікі.\n\nВиправлення помилок\nЦе кнопка «відмінити» («undo»), ви також можете натискати Z — відміняє останні дії, що ви зробили.\n\nВи можете «повернути» попередньо збережені версії ліній або точок. Виділіть лінію чи точку та клацніть на їх ідентифікаторі (число зліва знизу) або натисніть «H» (скорочено від 'history' - 'історія'). Ви побачите перелік всіх змін, які відбувались. Виберіть потрібну — до якої треба повернутись і натисніть «Повернути» (Revert).\n\nЯкщо ви випадково вилучили лінію та зберегли зміни — натисніть U (скорочено від 'undelete'). Будуть показані усі вилучені лінії. Виберіть ту, яка вам потрібна; розблокуйте її клацнувши на червоний за́мок; збережіть її як звичайно.\n\nВважаєте, що хтось робить помилки? Наділіть йому дружне повідомлення. Скористайтесь Історією (H), щоб знайти його ім’я та клацніть «Надіслати повідомлення» ('Mail').\n\nСкористайтесь Інспектором (див. «Меню»), щоб отримати корисну інформацію про поточну лінію чи точку.\nЧаПи\nЯк побачити точки треку?\nТочки треку показуються тільки, якщо ви клацнете «правити» на вкладці «GPS-треки». Файли містять як точки так і треки по них — сервер відкидає файли які місять тільки точки.\n\nЧаПи по Potlatch та OpenStreetMap.\n\n\n\nПришвидшення роботи\nЧим більший масштаб ви обрали — тим більше Potlatch повинен завантажити даних. Наблизьте мапу перед тим як перейти на вкладку «Правка».\n\nЗніміть позначку в меню з «включити курсори пера і руки» для максимальної швидкості.\n\nЯкщо сервер уповільнений — завітайте пізніше. Перегляньте у Вікіi інформацію про відомі проблеми. Іноді, як, наприклад: в неділю ввечері, навантаження на сервер дуже велике.\n\nPotlatch може запам’ятовувати найулюбленіші набори ваших теґів. Виділіть лінію чи точку з такими теґами, натисніть Ctrl, Shift та цифру від 1 до 9. Після цього ви можете застосовувати збережені набори теґів просто натискаючи Shift та потрібну цифру. (Вони будуть збережені кожного разу, коли ви користуєтесь Potlatch на цьому комп’ютері).\n\nЩоб перетворити ваш GPS-трек на шлях, знайдіть його у переліку на вкладці «GPS-треки», клацніть «правити» біля нього, поставте позначку у полі «перетворити». Він буде позначений заблокованим (червоним), тому ви не зможете зберегти його як лінію. Спочатку відредагуйте його, після цього клацніть на значок замка́ для його розблокування та подальшого збереження.\n\nЩо натискати\nПотягніть мапу для пересування.\nПодвійне клацання для створення нового об’єкту (POI).\nКлацніть щоб розпочати нову лінію.\nЗахватіть та потягніть лінію чи об’єкт (POI) для переміщення.\nКреслення ліній\nПодвійне клацання або натискання Enter для закінчення креслення.\nКлацніть на іншу лінію для перехрещення.\nShift-ЛК на кінці іншої лінії для з’єднання.\nВиділена лінія\nКлацніть на точку для її виділення.\nShift-ЛК на лінії для додання нової точки.\nShift-ЛК на точці для початку креслення нової лінії з цієї точки.\nControl-ЛК на іншій лінії для з’єднання.\n\nКомбінації клавіш\nB Додавання теґу джерела фону\nC Закрити набір змін\nG ПоказатиGPS-треки\nH Показати історію\nI Показати інспектора\nJ об’єднати перетинаючися лінії у спільній точці\n(+Shift) Unjoin from other ways\nK заблокувати/розблокувати поточне виділення\nL Показати поточні координати\nM розгорнути вікно редактора\nP Створити паралельну лінію\nR повторити теґи\nS Зберегти (не потрібно при «Редагування вживу»)\nT Спрямити/вирівняти лінію/коло\nU Відновити (показати вилучені лінії)\nX Розділити лінію на дві\nZ Відмінити\n- Вилучити точку тільки з цієї лінії\n+ Додати новий теґ\n/ Виділити іншу лінію, для якої ця точка є спільною\nDelete Вилучити точку\n (+Shift) Вилучити всю лінію\nReturn Закінчити креслення лінії\nSpace Натисніть та потягніть фон\nEsc Скасувати поточні зміни; перезавантажити дані з сервера\n0 Вилучити всі теґи\n1-9 Вибрати з шаблонів теґів\n (+Shift) Вибрати збережені теґи\n (+S/Ctrl) Запам’ятати теґи\n§ або ` Вибір між групами теґів\n\n" - hint_drawmode: клацніть для додання лінії\nподвійне клацання/Ввод\nдля закінчення - hint_latlon: "шир $1\nдов $2" - hint_loading: завантаження даних - hint_overendpoint: над кінцевою точкою ($1)\nклацніть для приєднання\nSHIFT-ЛК для злиття - hint_overpoint: над точкою ($1)\nклацніть для з'єднання - hint_pointselected: точка вибрана\n(Shift-ЛК на точці\nщоб розпочати нову лінію) - hint_saving: збереження даних - hint_saving_loading: завантаження/збереження даних - inspector: Перегляд мапи - inspector_duplicate: Дублікат - inspector_in_ways: В лініях - inspector_latlon: "Шир $1\nДов $2" - inspector_locked: Заблоковано - inspector_node_count: ($1 шт.) - inspector_not_in_any_ways: Жодної лінії (POI) - inspector_unsaved: Не збережено - inspector_uploading: (завантаження на сервер) - inspector_way_connects_to: З’єднано з $1 лініями - inspector_way_connects_to_principal: З’єднується з $1 $2 і $3 іншими $4 - inspector_way_nodes: точок ($1 шт.) - inspector_way_nodes_closed: $1 точок (замкнено) - loading: Завантаження… - login_pwd: "Пароль:" - login_retry: Ваше ім’я користувача не розпізнано. Спробуйте ще раз. - login_title: Не вдається увійти - login_uid: "Ім'я користувача:" - mail: Е.пошта - more: Ще - newchangeset: "\nСпробуйте знов: Potlatch розпочне новий набір змін." - "no": Ні - nobackground: Без фону - norelations: На поточній ділянці зв’язки відсутні - offset_broadcanal: Набережна широкого каналу - offset_choose: Вибір зсуву (м) - offset_dual: Дорога із розподілювальною смугою (D2) - offset_motorway: Автомагістраль (D3) - offset_narrowcanal: Набережна вузького каналу - ok: Так - openchangeset: Відкриття набору змін - option_custompointers: Включити курсори пера і руки - option_external: "Зовнішній запуск:" - option_fadebackground: Бляклий фон - option_layer_cycle_map: OSM — вело.мапа - option_layer_maplint: OSM — Maplint (помилки) - option_layer_mapnik: OSM — Mapnik - option_layer_nearmap: "Австралія: NearMap" - option_layer_ooc_25k: "В.БРИТАНІЯ істор.: 1:25k" - option_layer_ooc_7th: "В.БРИТАНІЯ істор.: 1:7000" - option_layer_ooc_npe: "В.БРИТАНІЯ істор.: NPE" - option_layer_ooc_scotland: "В.БРИТАНІЯ істор.: Шотландія" - option_layer_os_streetview: "В.БРИТАНІЯ: OS StreetView" - option_layer_osmarender: OSM — Osmarender - option_layer_streets_haiti: "Гаїті: назви вулиць" - option_layer_surrey_air_survey: "UK: Surrey Air Survey" - option_layer_tip: Оберіть фон - option_limitways: Попереджати при завантаженні\nвеликих обсягів даних - option_microblog_id: "Ім'я мікроблогу:" - option_microblog_pwd: "Пароль мікроблогу:" - option_noname: Виділяти дороги без назви - option_photo: "Фото KML:" - option_thinareas: Тонкі лінії для полігонів - option_thinlines: Тонкі лінії у всіх масштабах - option_tiger: Показати незмінений TIGER - option_warnings: Показувати підказки - point: Точка - preset_icon_airport: Аеропорт - preset_icon_bar: Бар - preset_icon_bus_stop: Автобусна зупинка - preset_icon_cafe: Кафе - preset_icon_cinema: Кінотеатр - preset_icon_convenience: Мінімаркет - preset_icon_disaster: Будівля на Гаїті - preset_icon_fast_food: Забігайлівка - preset_icon_ferry_terminal: Паром - preset_icon_fire_station: Пожежна частина - preset_icon_hospital: Лікарня - preset_icon_hotel: Готель - preset_icon_museum: Музей - preset_icon_parking: Стоянка - preset_icon_pharmacy: Аптека - preset_icon_place_of_worship: Культова споруда - preset_icon_police: Міліція, поліція - preset_icon_post_box: Поштова скриня - preset_icon_pub: Пивна - preset_icon_recycling: Бак для сміття - preset_icon_restaurant: Ресторан - preset_icon_school: Школа - preset_icon_station: Залізнична станція - preset_icon_supermarket: Супермаркет - preset_icon_taxi: Таксі - preset_icon_telephone: Телефон - preset_icon_theatre: Театр - preset_tip: Виберіть з меню шаблонів теґів, описаному в $1 - prompt_addtorelation: Додати $1 до зв’язку - prompt_changesetcomment: "Опишіть ваші зміни:" - prompt_closechangeset: Закриття набору змін $1 - prompt_createparallel: Створення паралельної лінії - prompt_editlive: Правка вживу - prompt_editsave: Редагування із збереженням - prompt_helpavailable: Ви новачок? Скористайтеся кнопкою «Довідка». - prompt_launch: Перейти за зовнішнім посиланням - prompt_live: При правці вживу, кожен елемент, який ви змінюєте, зберігається в базу даних OpenStreetMap миттєво. Для початківців, цей режим не рекомендується. Ви впевнені? - prompt_manyways: Ця ділянка має багато елементів і тому буде довго завантажуватись з сервера. Може краще наблизитись? - prompt_microblog: Надіслати до $1 (лишилось $2) - prompt_revertversion: "Повернутися до попередньої збереженої версії:" - prompt_savechanges: Збереження змін - prompt_taggedpoints: Деякі точки з цієї ліні мають теґи чи входять до складу зв’язків. Дійсно вилучити? - prompt_track: Перетворити GPS-трек в лінію - prompt_unlock: Клацніть, щоб розблокувати - prompt_welcome: Ласкаво просимо до OpenStreetMap! - retry: Повтор - revert: Повернути - save: Зберегти - tags_backtolist: Повернутись до списку - tags_descriptions: Опис '$1' - tags_findatag: Шукати теґ - tags_findtag: Знайти теґ - tags_matching: Популярні теґи, що підходять "$1" - tags_typesearchterm: "Введіть слово для пошуку:" - tip_addrelation: Додати до зв’язку - tip_addtag: Додати теґ - tip_alert: Помилка — клацніть, щоб дізнатись подробиці - tip_anticlockwise: Замкнена лінія проти годинникової стрілки — змінити напрямок - tip_clockwise: Замкнена лінія за годинниковою стрілкою — змінити напрямок - tip_direction: Напрямок лінії — змінити на протилежний - tip_gps: Показати GPS-треки (G) - tip_noundo: Відміняти нічого - tip_options: Налаштування (вибір фону мапи) - tip_photo: Завантаження фотографій - tip_presettype: Оберіть які типи шаблонів показувати в меню. - tip_repeattag: Скопіювати теґи з попередньо вибраної лінії (R) - tip_revertversion: Оберіть версію для відновлення - tip_selectrelation: Додати до обраного маршруту - tip_splitway: Розділити лінію в поточній точці (X) - tip_tidy: Вирівняти точки у лінії (Т) - tip_undo: Відмінити $1 (Z) - uploading: Передача даних на сервер … - uploading_deleting_pois: Вилучення об’єктів (POI) - uploading_deleting_ways: Вилучення ліній - uploading_poi: Передача на сервер об’єкта (POI) $1 - uploading_poi_name: Завантаження на сервер об’єктів (POI) $1, $2 - uploading_relation: Завантаження зв’язку $1 на сервер - uploading_relation_name: Завантаження на сервер зв’язку $1, $2 - uploading_way: Завантаження на сервер лінії $1 - uploading_way_name: Передача на сервер лінії $1, $2 - warning: Попередження! - way: Лінія - "yes": Так diff --git a/config/potlatch/locales/vi.yml b/config/potlatch/locales/vi.yml deleted file mode 100644 index 6963688a1..000000000 --- a/config/potlatch/locales/vi.yml +++ /dev/null @@ -1,240 +0,0 @@ -# Messages for Vietnamese (Tiếng Việt) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Minh Nguyen -# Author: Vinhtantran -vi: - a_poi: $1 địa điểm - a_way: $1 lối - action_addpoint: đang thêm nốt vào cuối lối - action_cancelchanges: đang hủy bỏ các thay đổi - action_changeway: thay đổi lối - action_createparallel: đang tạo lối song song - action_createpoi: đang tạo địa điểm - action_deletepoint: đang xóa điểm - action_insertnode: đang gắn nốt vào lối - action_mergeways: đang hợp nhất hai lối - action_movepoi: đang chuyển địa điểm - action_movepoint: đang chuyển điểm - action_moveway: đang chuyển lối - action_pointtags: đang gắn thẻ vào điểm - action_poitags: đang gắn thẻ vào địa điểm - action_reverseway: đang đảo ngược lối - action_revertway: đang lùi lối - action_splitway: đang chia cắt lối - action_waytags: đang gắn thẻ vào lối - advanced: Nâng cao - advanced_close: Đóng bộ thay đổi - advanced_history: Lịch sử lối - advanced_inspector: Bộ kiểm tra - advanced_maximise: Phóng to cửa sổ - advanced_minimise: Thu nhỏ cửa sổ - advanced_parallel: Lối song song - advanced_tooltip: Tác vụ sửa đổi nâng cao - advanced_undelete: Phục hồi - advice_bendy: Quá quanh co để thẳng ra (SHIFT để ép) - advice_conflict: "Xung đột với máy chủ: có lẽ cần phải lưu lần nữa" - advice_deletingpoi: Đang xóa địa điểm (Z để hủy bỏ) - advice_deletingway: Đang xóa lối (Z để hủy bỏ) - advice_microblogged: Đã cập nhật trạng thái $1 của bạn - advice_nocommonpoint: Các lối không cắt ngang nhau tại điểm nào - advice_revertingpoi: Đang lùi địa điểm về phiên bản trước (Z để hủy bỏ) - advice_revertingway: Đang lùi lối về phiên bản trước (Z để hủy bỏ) - advice_tagconflict: Các thẻ không hợp – xin kiểm tra lại - advice_toolong: Dài quá không thể mở khóa – xin chia cắt nó thành các lối ngắn hơn - advice_uploadempty: Không có gì để tải lên - advice_uploadfail: Việc tải lên bị thất bại - advice_uploadsuccess: Tất cả dữ liệu được tải lên thành công - advice_waydragged: Đã kéo lối (Z để lùi lại) - cancel: Hủy bỏ - closechangeset: Đang đóng bộ thay đổi - conflict_download: Tải xuống phiên bản của họ - conflict_overwrite: Ghi đè phiên bản của họ - conflict_poichanged: Người khác đã thay đổi nốt $1$2 sau khi bạn bắt đầu sửa. - conflict_relchanged: Người khác đã thay đổi quan hệ $1$2 sau khi bạn bắt đầu sửa. - conflict_visitpoi: Bấm “OK” để hiện địa điểm. - conflict_visitway: Bấm “OK” để hiện lối. - conflict_waychanged: Người khác đã thay đổi lối $1$2 sau khi bạn bắt đầu sửa. - createrelation: Tạo quan hệ mới - custom: "Khác:" - delete: Xóa - deleting: đang xóa - drag_pois: Kéo và thả các địa điểm ưa thích - editinglive: Đang áp dụng ngay - editingoffline: Đang sửa đổi ngoại tuyến - emailauthor: \n\nXin gửi thư điện tử cho richard\@systemeD.net báo cáo lỗi và giải thích bạn làm gì lúc khi gặp lỗi. - error_anonymous: Không thể liên lạc với người vẽ vô danh. - error_connectionfailed: "Rất tiếc, không thể kết nối với máy chủ OpenStreetMap. Những thay đổi gần đây có thể chưa được lưu.\n\nBạn có muốn thử lại không?" - error_microblog_long: "Việc đăng lên $1 bị thất bại:\nMã HTTP: $2\nThông báo lỗi: $3\nLỗi $1: $4" - error_nopoi: Không tìm thấy địa điểm (có lẽ bạn đã kéo ra khỏi vùng?) nên không thể lùi lại. - error_nosharedpoint: Các lối $1 và $2 không còn cắt ngang nhau tại điểm nào, nên không thể lùi lại việc chia cắt lối. - error_noway: Không tìm thấy $1 (có lẽ bạn đã kéo ra khỏi vùng?) nên không thể lùi lại. - error_readfailed: Rất tiếc, máy chủ OpenStreetMap không phản ứng lời yêu cầu dữ liệu.\n\nBa.n có muốn thử lại không? - existingrelation: Xếp vào quan hệ đã tồn tại - findrelation: Tìm kiếm quan hệ chứa - gpxpleasewait: Xin chờ, đang xử lý tuyến đường GPX. - heading_drawing: Vẽ - heading_introduction: Giới thiệu - heading_pois: Bắt đầu - heading_quickref: Tham khảo nhanh - heading_surveying: Khảo sát - heading_tagging: Gắn thẻ - heading_troubleshooting: Trục trặc - help: Trợ giúp - help_html: "Hoan nghênh bạn đã đến với Potlatch\nPotlatch là chương trình vẽ bản đồ dễ dàng của OpenStreetMap. Hãy vẽ đường sá, đường bộ, địa điểm quan tâm, tiệm, và đủ thứ khác dựa trên dữ liệu khảo sát GPS, hình ảnh vệ tinh, và bản đồ cũ.\n\nCác trang trợ giúp này sẽ dẫn bạn qua các căn bản sử dụng Potlatch và chỉ đến những nơi tìm hiểu thêm. Nhấn chuột vào các tiêu đề ở trên để bắt đầu.\n\nKhi nào đọc xong, chỉ việc nhấn chuột vào trang này ở ngoài hộp trợ giúp.\n\n\n\nMẹo vặt\nĐừng chép từ bản đồ khác!\n\nNếu chọn “Áp dụng Ngay”, các điểm lối của bạn sẽ được lưu ngay khi bỏ chọn nó – ngay lập tức. Nếu chưa rành với OpenStreetMap, vui lòng chọn “Lưu Sau” để cho các điểm lối chỉ được lưu lúc khi bấm nút “Lưu”.\n\nCác sửa đổi của bạn sẽ được phản ánh trên bản đồ trong vòng một vài tiếng, nhưng một vài thay đổi lớn cần một tuần để cập nhật. Bản đồ không hiện tất cả mọi thứ, vậy nó sạch sẽ được. Bởi vì dữ liệu OpenStreetMap là mã nguồn mở, người khác có thể thoải mái sản xuất bản đồ kiểu khác, thí dụ như OpenCycleMap (đường xe đạp) hoặc Midnight Commander.\n\nXin nhớ rằng OpenStreetMap cùng lúc là bản đồ đẹp đẽ (bởi vậy hãy vẽ đường cong thật rõ) và biểu đồ (hãy nối lại các đường tại ngã tư, trừ khi có bắc qua).\n\nLần nữa, nhớ đừng chép từ bản đồ khác nhé!\n\n\nTìm hiểu thêm\nHướng dẫn Potlatch\nDanh sách thư\nChat trực tuyến (trợ giúp từ người thật)\nDiễn đàn Web\nWiki của cộng đồng\nMã nguồn Potlatch\n\n\n\nBắt đầu\nBây giờ đã mở Potlatch thì hãy nhấn chuột vào “Lưu Sau” để bắt đầu.\n\nBạn đã sẵn sàng vẽ vào bản đồ. Cách bắt đầu dễ dàng nhất là thêm những địa điểm quan tâm vào bản đồ, thí dụ như tiệm ăn, nhà thờ, nhà trường, nhà ga…\n\nKéo thả\nCó sẵn một số loại địa điểm thường gặp ngay vào dưới bản đồ cho tiện. Kéo và thả nút địa điểm vào đúng chỗ trên bản đồ. Vả lại, đừng ngại nếu lần đầu tiên thả nó vào chỗ sai; chỉ việc kéo nó tới chỗ đúng. Địa điểm được tô đậm màu vàng vì nó đang được chọn.\n\nBây giờ thì nên đặt tên cho tiệm ăn (hay nhà thờ, nhà trường…). Để ý mới có bảng nhỏ ở dưới liệt kê một số tính năng của địa điểm. Một dòng đề “name” (tức là “tên”) ở bên trái, còn bên phải là “(type name here)”. Nhấn chuột vào bên phải và nhập tên trong ngôn ngữ địa phương.\n\nNhấn chuột trên bản đồ ngoài địa điểm đó thì địa điểm sẽ được bỏ chọn và hộp màu mè sẽ trở lại.\n\nDễ dàng nhỉ? Khi nào xong, bấm nút “Lưu” ở dưới bên phải.\nChuyển động\nĐể chuyển tới phần bản đồ khác, nhấn chuột vào một vùng trống và kéo. Sau khi thả chuột, Potlatch sẽ tự động tải dữ liệu mới. (Phía trên bên phải có hình quay quay cho biết đang hoạt động.)\n\nChúng tôi đã bảo bạn chọn “Lưu Sau” trước khi sửa đổi. Tuy nhiên, bạn cũng có thể chọn “Áp dụng Ngay” để tự động lưu các thay đổi vào CSDL sau khi bỏ chọn điểm hay lối, vậy không cần bấm nút “Lưu” nào. Chế độ này có ích khi chỉ cần thực hiện một số thay đổi nhỏ, cũng như tại các tiệc vẽ bản đồ.\n\nCác bước sau\nBạn vẫn còn hiểu kịp không? OK! Nhấn “Khảo sát” ở trên để tìm hiểu cách vẽ bản đồ thật hay!\n\nKhảo sát dùng GPS\nMục đích của OpenStreetMap là xây dựng một bản đồ rất đầy đủ không dính líu vào bản quyền hạn chế của các bản đồ kia. Bởi vậy bạn không được phép chép từ bản đồ khác: thay vì vậy, vui lòng bước ra nhà và khảo sát đường sá lấy. May là cách này vui vẻ lắm!\nMột công cụ rất hữu ích là máy GPS cầm tay. Tìm ra một vùng chưa được biểu diễn trên bản đồ, bật lên GPS, rồi đi bộ hay đạp xe tới lui. Để ý đến các tên đường và những gì khác đáng kể trên đường: quán cà phê, nhà trường, tiệm phở…\n\nSau khi về nhà, máy GPS sẽ chứa “tracklog” (nhật ký hành trình) có các nơi đã thăm để tải lên OpenStreetMap.\n\nMáy GPS tốt nhất là loại ghi vào tracklog thường xuyên (1–2 giây một lần) và có bộ nhớ lớn. Nhiều người đóng góp sử dụng máy Garmin cầm tay hoặc máy Bluetooth nho nhỏ. Có sẵn nhiều bài xem xét GPS trên wiki.\n\nTải lên tuyến đường\nTrước tiên, bạn cần phải rút tuyến ra khỏi máy GPS. Có lẽ máy GPS có sẵn phần mềm đặc biệt, hoặc có thể nó cho phép chép các tập tin qua USB. Nếu không, hãy ghé vào GPSBabel. Dù sao, nhớ chuyển tập tin qua định dạng GPX.\n\nSau đó, tải tuyến đường lên OpenStreetMap dùng thẻ “Tuyến đường GPS”. Lưu ý rằng nó chưa hiện trên bản đồ được. Bạn cần phải vẽ và đặt tên các đường bằng tay theo tuyến đường được tải lên.\nSử dụng tuyến đường\nTìm kiếm tuyến đường của bạn trong danh sách “Tuyến đường GPS” và theo liên kết “sửa đổi” ngay bên cạnh nó. Potlatch sẽ khởi động và tải tuyến đường này và các địa điểm. Có sẵn sàng vẽ không?\n\nCũng có thể bấm nút này để hiện tuyến đường GPS của mọi người (trừ các địa điểm) trong vùng đang xem. Bấm giữ Shift để chỉ hiện các tuyến đường của bạn.\nSử dụng hình ảnh vệ tinh\nNếu không có máy GPS, đừng lo ngại! Yahoo! đã cung cấp hình ảnh vệ tinh ở nhiều quốc gia để cho bạn vẽ lên. (Cám ơn, Yahoo!) Hãy bước ra đường, ghi nhớ các tên đường, và trở về vẽ đường sá lên hình.\n\nNếu bạn không nhìn thấy hình ảnh vệ tinh, bấm nút Tùy chọn và chắc chắn chọn “Yahoo!” Nếu vẫn chưa được, có lẽ hình ảnh vệ tinh chưa có sẵn tại địa phương của bạn, hoặc có lẽ cần thu nhỏ một tí.\n\nOn this same options button you'll find a few other choices like an out-of-copyright map of the UK, and OpenTopoMap for the US. These are all specially selected because we're allowed to use them - don't copy from anyone else's maps or aerial photos. (Copyright law sucks.)\n\nSometimes satellite pics are a bit displaced from where the roads really are. If you find this, hold Space and drag the background until it lines up. Always trust GPS tracks over satellite pics.\n\nVẽ lối\nTo draw a road (or 'way') starting at a blank space on the map, just click there; then at each point on the road in turn. When you've finished, double-click or press Enter - then click somewhere else to deselect the road.\n\nTo draw a way starting from another way, click that road to select it; its points will appear red. Hold Shift and click one of them to start a new way at that point. (If there's no red point at the junction, shift-click where you want one!)\n\nBấm nút “Lưu” ở phía dưới bên phải khi nào xong. Hãy lưu thường xuyên hễ trường hợp máy chủ bị trục trặc.\n\nĐừng mong chờ các thay đổi của bạn hiện ra ngay trên bản đồ chính. Tùy thay đổi, có thể cần chờ đợi một vài tiếng hay đôi khi tới một tuần lễ. Hãy thử tải lại trang thường xuyên để loại ra các hình bản đồ lỗi thời.\nNối đường\nIt's really important that, where two roads join, they share a point (or 'node'). Route-planners use this to know where to turn.\n\nPotlatch takes care of this as long as you are careful to click exactly on the way you're joining. Look for the helpful signs: the points light up blue, the pointer changes, and when you're done, the junction point has a black outline.\nDi chuyển và xóa\nThis works just as you'd expect it to. To delete a point, select it and press Delete. To delete a whole way, press Shift-Delete.\n\nĐể di chuyển điểm hay lối, chỉ việc kéo nó. (Trước khi kéo lối, hãy nhấn giữ chuột vào nó; phải như vậy để khó kéo nó ngẫu nhiên.)\nVẽ nâng cao hơn\nIf two parts of a way have different names, you'll need to split them. Click the way; then click the point where it should be split, and click the scissors. (You can merge ways by clicking with Control, or the Apple key on a Mac, but don't merge two roads of different names or types.)\n\nRoundabouts are really hard to draw right. Don't worry - Potlatch can help. Just draw the loop roughly, making sure it joins back on itself at the end, then click this icon to 'tidy' it. (You can also use this to straighten out roads.)\nĐịa điểm quan tâm\nThe first thing you learned was how to drag-and-drop a point of interest. You can also create one by double-clicking on the map: a green circle appears. But how to say whether it's a pub, a church or what? Click 'Tagging' above to find out!\n\nĐường loại nào?\nOnce you've drawn a way, you should say what it is. Is it a major road, a footpath or a river? What's its name? Are there any special rules (e.g. \"no bicycles\")?\n\nIn OpenStreetMap, you record this using 'tags'. A tag has two parts, and you can have as many as you like. For example, you could add highway | trunk to say it's a major road; highway | residential for a road on a housing estate; or highway | footway for a footpath. If bikes were banned, you could then add bicycle | no. Then to record its name, add name | Market Street.\n\nThe tags in Potlatch appear at the bottom of the screen - click an existing road, and you'll see what tags it has. Click the '+' sign (bottom right) to add a new tag. The 'x' by each tag deletes it.\n\nCó thể gắn thẻ vào nguyên một lối, nốt trong lối (có thể cổng hay đèn xanh đỏ), và địa điểm quan tâm.\nSử dụng thẻ có sẵn\nCác bộ thẻ có sẵn trong Potlach làm cho dễ gắn thẻ vào những nét thường gặp trên bản đồ.\n\nSelect a way, then click through the symbols until you find a suitable one. Then, choose the most appropriate option from the menu.\n\nCác thẻ sẽ được điền vào. Một số thẻ sẽ được còn trống để cho bạn điền vào tên và số đường chẳng hạn.\nĐường một chiều\nYou might want to add a tag like oneway | yes - but how do you say which direction? There's an arrow in the bottom left that shows the way's direction, from start to end. Click it to reverse.\nSáng chế thẻ\nDĩ nhiên, vì đây là wiki, bạn không cần hạn chế mình chỉ sử dụng các thẻ co sẵn. Bấm nút “+” để gắn bất cứ thẻ nào tùy ý.\n\nYou can see what tags other people use at OSMdoc, and there is a long list of popular tags on our wiki called Map Features. But these are only suggestions, not rules. You are free to invent your own tags or borrow from others.\n\nVì đủ mọi loại bản đồ dựa vào dữ liệu OpenStreetMap, mỗi bản đồ kết xuất (tức là vẽ) một số thẻ được lựa chọn.\nQuan hệ\nSometimes tags aren't enough, and you need to 'group' two or more ways. Maybe a turn is banned from one road into another, or 20 ways together make up a signed cycle route. You can do this with an advanced feature called 'relations'. Find out more on the wiki.\n\nLùi lại thay đổi sai\nĐây là nút “Lùi lại”, cũng được truy cập bằng phím Z, để lùi lại thay đổi cuối cùng của bạn trong phiên sửa đổi này.\n\nYou can 'revert' to a previously saved version of a way or point. Select it, then click its ID (the number at the bottom left) - or press H (for 'history'). You'll see a list of everyone who's edited it, and when. Choose the one to go back to, and click Revert.\n\nNếu đã tình cờ xóa lối và đã lưu bộ thay đổi, bấm phím U để hiển thị các lối đã xóa. Chọn lối để mang lại và mở khóa nó bằng cách nhấn chuột vào khóa móc màu đỏ. Sau cùng, nhớ lưu bình thường.\n\nHễ người khác vẽ sai, xin vui lòng gửi cho họ một thông điệp thân mật. Nhấn chuột vào ID của điểm hay lối hoặc bấm phím H để xem tên của họ, rồi bấm “Thư”.\n\nSử dụng Bộ kiểm tra (trong trình đơn “Nâng cao”) để xem chi tiết có ích về điểm lối đang chọn.\nHỏi đáp\nHow do I see my waypoints?\nWaypoints only show up if you click 'edit' by the track name in 'GPS Traces'. The file has to have both waypoints and tracklog in it - the server rejects anything with waypoints alone.\n\nCó sẵn thêm bài hỏi đáp về Potlatch và OpenStreetMap.\n\n\n\nTăng tốc độ\nCàng thu nhỏ càng bắt Potlatch phải tải thêm dữ liệu cùng lúc. Phóng to trước khi bấm “Sửa đổi”.\n\nTắt “Hiện con trỏ bút và tay” (trong cửa sổ tùy chọn) để cho trình vẽ nhanh nhẹn hơn.\n\nNếu máy chủ đang chạy chậm, hãy trở lại lát nữa. Kiểm tra wiki về các vấn đề đã biết. Những lúc như tối chủ nhật thì máy chủ chắc bận.\n\nPotlatch có thể nhớ các bộ thẻ ưu thích của bạn. Chọn lối hoặc điểm có những thẻ muốn nhớ, rồi giữ Ctrl và Shift và bấm số từ 1 đến 9. Từ lúc đó, có thể gắn các thẻ đó bằng cách giữ Shift và bấm số đó. (Các bộ thẻ sẽ được nhớ mỗi lần sử dụng Potlatch trên máy tính này.)\n\nĐể đổi tuyến đường GPS thành lối, kiếm nó trong danh sách “Tuyến đường GPS”, bấm “sửa” bên cạnh nó, và chọn hộp “Chuyển đổi”. Lối này mới đầu bị khóa (vẽ màu đỏ) nên chưa được lưu. Trước tiên phải sửa đổi nó rồi bấm hình khóa móc màu đỏ để mở khóa trước khi lưu.\n\nCách dùng chuột\nKéo bản đồ để chuyển động.\nNhấn đúp để tạo địa điểm mới.\nNhấn một lần để bắt đầu lối mới.\nCầm kéo điểm hay lối để di chuyển nó.\nKhi vẽ lối\nNhấn đúp hoặc bấm Enter để vẽ xong.\nNhấn vào lối khác để nối liền.\nGiữ Shift và nhấn chuột vào cuối lối khác để nối liền và hợp nhất.\nKhi lối được chọn\nNhấn vào nốt trong lối để chọn nó.\nGiữ Shift và nhấn chuộc vào lối để chèn nốt mới.\nGiữ Shift và nhấn chuột vào nốt trong lối để bắt đầu lối mới từ nốt đó.\nGiữ Shift và nhấn chuột vào lối liền để hợp nhất.\n\nPhím tắt\nB Gắn thẻ nguồn là hình nền\nC Đóng bộ thay đổi\nG Hiện tuyến đường GPS\nH Xem lịch sử\nI Hiện bộ kiểm tra\nJ Nối liền các lối cắt qua nốt\n(+Shift) Unjoin from other ways\nK Khóa/mở khóa điểm hay lối\nL Hiện tọa độ của con trỏ\nM Phóng to hộp sửa đổi\nP Chia thành hai lối song song\nR Lặp lại các thẻ lần trước\nS Lưu (chỉ chế độ “Lưu Sau”)\nT Thẳng/tròn ra các nốt trong lối\nU Hiện lối đã xóa để phục hồi\nX Cắt đôi lối tại nốt\nZ Lùi lại\n- Gỡ điểm khỏi lối (không phải các lối nối liền)\n+ Gắn thẻ mới\n/ Chọn lối khác có nốt này\nDelete Xóa nốt hay địa điểm\n (+Shift) Xóa cả lối\nReturn Kết thúc lối đang vẽ\nSpace Giữ phím cách để kéo hình nền\nEsc Hủy bỏ thay đổi và tải lại điểm hay lối này\n0 Gỡ các thẻ\n1-9 Gắn thẻ có sẵn từ trình đơn\n (+Shift) Gắn thẻ từ bộ nhớ\n (+S/Ctrl) Lưu thẻ vào bộ nhớ\n§ or ` Chu kỳ giữa các trình đơn thẻ\n\n" - hint_drawmode: nhấn chuột để thêm điểm\nnhấn đúp/Enter\nđể kết thúc lối - hint_latlon: "vđ $1\nkđ $2" - hint_loading: đang tải các lối - hint_overendpoint: đang trên điểm kết thúc\nnhấn chuột để nối\nshift-nhấn chuột để hợp nhất - hint_overpoint: đang trên điểm\nnhấn chuột để nối - hint_pointselected: đã chọn điểm\n(shift-nhấn chuột để\nbắt đầu lối mới) - hint_saving: đang lưu dữ liệu - hint_saving_loading: đang tải/lưu dữ liệu - inspector: Bộ Kiểm tra - inspector_duplicate: Bản sao của - inspector_in_ways: Số lối - inspector_latlon: "Vĩ độ $1\nKinh độ $2" - inspector_locked: Đang khóa - inspector_node_count: ($1 lần) - inspector_not_in_any_ways: Không thuộc lối nào (địa điểm) - inspector_unsaved: Chưa lưu - inspector_uploading: (đang tải lên) - inspector_way: $1 - inspector_way_connects_to: Nối liền với $1 lối - inspector_way_connects_to_principal: Nối liền $1 $2 và $3 $4 khác - inspector_way_name: $1 ($2) - inspector_way_nodes: $1 nốt - inspector_way_nodes_closed: $1 nốt (đóng) - loading: Đang tải… - login_pwd: "Mật khẩu:" - login_retry: Không nhận ra tài khoản đăng ký của bạn. Vui lòng thử lần nữa. - login_title: Không thể đăng nhập - login_uid: "Tên đăng ký:" - mail: Thư - microblog_name_identica: Identi.ca - microblog_name_twitter: Twitter - more: Thêm - newchangeset: Vui lòng thử lần nữa. Potlatch sẽ mở bộ thay đổi mới. - "no": Có - nobackground: Không có nền - norelations: Không có quan hệ trong vùng này - offset_broadcanal: Lối kéo của kênh rộng - offset_choose: Chọn bề ngang (m) - offset_dual: Vách ngăn đôi (D2) - offset_motorway: Đường cao tốc (D3) - offset_narrowcanal: Lối kéo của kênh hẹp - ok: OK - openchangeset: Đang mở bộ thay đổi - option_custompointers: Hiện con trỏ bút và tay - option_external: "Khởi động bên ngoài:" - option_fadebackground: Nhạt màu nền - option_layer_cycle_map: OSM – bản đồ xe đạp - option_layer_digitalglobe_haiti: "Haiti: DigitalGlobe" - option_layer_geoeye_gravitystorm_haiti: "Haiti: GeoEye 13/1" - option_layer_geoeye_nypl_haiti: "Haiti: GeoEye 13/1 về sau" - option_layer_maplint: OSM – Maplint (các lỗi) - option_layer_mapnik: OSM – Mapnik - option_layer_nearmap: "Úc: NearMap" - option_layer_ooc_25k: "Anh lịch sử: 1:25k" - option_layer_ooc_7th: "Anh lịch sử: lần in 7" - option_layer_ooc_npe: "Anh lịch sử: NPE" - option_layer_ooc_scotland: "Anh lịch sử: Scotland" - option_layer_os_streetview: "Anh: OS StreetView" - option_layer_osmarender: OSM – Osmarender - option_layer_streets_haiti: "Haiti: tên đường sá" - option_layer_surrey_air_survey: "Anh: Khảo sát Hàng không Surrey" - option_layer_tip: Chọn nền để hiển thị - option_layer_yahoo: Yahoo! - option_limitways: Báo trước khi tải nhiều dữ liệu - option_microblog_id: "Tên tiểu blog:" - option_microblog_pwd: "Mật khẩu tiểu blog:" - option_noname: Tô sáng đường sá không tên - option_photo: "KML hình chụp:" - option_thinareas: Vẽ đường khung hẹp cho khu vực - option_thinlines: Hiện đường hẹp ở các tỷ lệ - option_tiger: Tô sáng dữ liệu TIGER chưa sửa - option_warnings: Nổi các cảnh báo - point: Điểm - preset_icon_airport: Sân bay - preset_icon_bar: Quán rượu - preset_icon_bus_stop: Chỗ đậu xe buýt - preset_icon_cafe: Quán cà phê - preset_icon_cinema: Rạp phim - preset_icon_convenience: Tiệm tạp hoá - preset_icon_disaster: Tòa nhà Haiti - preset_icon_fast_food: Nhà hàng ăn nhanh - preset_icon_ferry_terminal: Phà - preset_icon_fire_station: Trạm cứu hỏa - preset_icon_hospital: Bệnh viện - preset_icon_hotel: Khách sạn - preset_icon_museum: Bảo tàng - preset_icon_parking: Bãi đậu xe - preset_icon_pharmacy: Nhà thuốc - preset_icon_place_of_worship: Nơi thờ phụng - preset_icon_police: Đồn cảnh sát - preset_icon_post_box: Hòm thư - preset_icon_pub: Tiệm rượu - preset_icon_recycling: Trung tâm tái sinh - preset_icon_restaurant: Nhà hàng - preset_icon_school: Trường học - preset_icon_station: Nhà ga - preset_icon_supermarket: Siêu thị - preset_icon_taxi: Bến xe taxi - preset_icon_telephone: Điện thoại - preset_icon_theatre: Nhà hát - preset_tip: Chọn bộ thẻ có sẵn để miêu tả $1 - prompt_addtorelation: Xếp $1 vào quan hệ - prompt_changesetcomment: "Miêu tả các thay đổi:" - prompt_closechangeset: Đóng bộ thay đổi $1 - prompt_createparallel: Chia thành hai lối song song - prompt_editlive: Áp dụng Ngay - prompt_editsave: Lưu Sau - prompt_helpavailable: Mới tới đây? Có trợ giúp dưới đây ở bên trái. - prompt_launch: Mở URL bên ngoài - prompt_live: Bạn có chắc muốn sử dụng chế độ Áp dụng Ngay? Không khuyên sử dụng nó nếu mới bắt đầu tập vẽ, vì mỗi điểm lối sẽ được lưu ngay lúc khi bạn thay đổi nó. - prompt_manyways: Vùng này có rất nhiều chi tiết cần nhiều thời gian để tải. Bạn có muốn phóng to để bớt những phần không cần xem không? - prompt_microblog: Đăng lên $1 (còn $2 chữ) - prompt_revertversion: "Lùi lại phiên bản cũ hơn:" - prompt_savechanges: Lưu các thay đổi - prompt_taggedpoints: Một số điểm trên lối này đã được gắn thẻ hoặc thuộc về quan hệ. Bạn có chắc muốn xóa nó? - prompt_track: Chuyển đổi tuyến đường GPS thành các lối (khóa) để sửa đổi. - prompt_unlock: Nhấn chuột để mở khóa - prompt_welcome: Hoan nghênh bạn đã đến OpenStreetMap! - retry: Thử lại - revert: Lùi lại - save: Lưu - tags_backtolist: Quay lại danh sách - tags_descriptions: Miêu tả “$1” - tags_findatag: Tìm kiếm thẻ - tags_findtag: Tìm kiếm thẻ - tags_matching: Các thẻ phổ biến trùng hợp với “$1” - tags_typesearchterm: "Nhập từ để tìm kiếm:" - tip_addrelation: Xếp vào quan hệ - tip_addtag: Thêm thẻ mới - tip_alert: Đã gặp lỗi - nhấn để xem chi tiết - tip_anticlockwise: Lối vòng ngược chiều kim đồng hồ – nhấn để đảo ngược - tip_clockwise: Lối vòng theo chiều kim đồng hồ – nhấn để đảo ngược - tip_direction: Hướng của lối – nhấn để đảo ngược - tip_gps: Hiện các tuyến đường GPS (G) - tip_noundo: Không có gì để lùi - tip_options: Tùy chỉnh (chọn nền bản đồ) - tip_photo: Tải hình ảnh - tip_presettype: Chọn các loại thẻ được định trước trong trình đơn. - tip_repeattag: Chép các thẻ từ lối được chọn trước (R) - tip_revertversion: Chọn phiên bản để lùi lại - tip_selectrelation: Thêm vào tuyến đường đã chọn - tip_splitway: Chia cắt lối tại điểm đã chọn (X) - tip_tidy: Thẳng/tròn ra các nốt trong lối (T) - tip_undo: Lùi $1 (Z) - uploading: Đang tải lên… - uploading_deleting_pois: Đang xóa địa điểm - uploading_deleting_ways: Đang xóa lối - uploading_poi: Đang tải lên địa điểm $1 - uploading_poi_name: Đang tải lên địa điểm $1, $2 - uploading_relation: Đang tải lên quan hệ $1 - uploading_relation_name: Đang tải lên quan hệ $1, $2 - uploading_way: "Đang tải lên lối: $1" - uploading_way_name: Đang tải lên lối $1, $2 - warning: Cảnh báo! - way: Lối - "yes": Không diff --git a/config/potlatch/locales/zh-CN.yml b/config/potlatch/locales/zh-CN.yml deleted file mode 100644 index 6eab16ca0..000000000 --- a/config/potlatch/locales/zh-CN.yml +++ /dev/null @@ -1,221 +0,0 @@ -# Messages for Simplified Chinese (‪中文(简体)‬) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: Hydra -# Author: Liangent -# Author: Mmyangfl -# Author: PhiLiP -zh-CN: - a_poi: $1兴趣点 - a_way: $1路径 - action_addpoint: 在路径末尾添加节点 - action_cancelchanges: 取消变更对 - action_changeway: 路径的更改 - action_createparallel: 创建并行的路径 - action_createpoi: 创建兴趣点 - action_deletepoint: 删除点 - action_insertnode: 在路径中添加节点 - action_mergeways: 合并两条路径中 - action_movepoi: 移动兴趣点 - action_movepoint: 移动节点中 - action_moveway: 移动路径 - action_pointtags: 节点上的标签 - action_poitags: 在兴趣点上设置标签 - action_reverseway: 恢复路径中 - action_revertway: 恢复路径中 - action_splitway: 分割路径中 - action_waytags: 在路径上设置标签 - advanced: 高级 - advanced_close: 关闭修改集合 - advanced_history: 路径历史 - advanced_inspector: 检查器 - advanced_maximise: 最大化窗口 - advanced_minimise: 最小化窗口 - advanced_parallel: 并行路径 - advanced_tooltip: 高级编辑操作 - advanced_undelete: 撤消删除 - advice_bendy: 太弯曲以至于不能拉直（SHIFT以强制执行） - advice_conflict: 服务器冲突 - 您可能需要再次尝试保存 - advice_deletingpoi: 删除兴趣点（Z以撤销） - advice_deletingway: 删除路径 (Z 撤消) - advice_microblogged: 更新你的 $1 的状态 - advice_nocommonpoint: 这些路径不共享一个公共节点 - advice_revertingpoi: 恢复到上次保存的兴趣点（Z以撤销） - advice_revertingway: 恢复到上次保存的路径中 (Z 撤消) - advice_tagconflict: 标签不匹配 - 请检查(Z 撤消) - advice_toolong: 解锁的时间太长 - 请分割成较短的路径 - advice_uploadempty: 没什么可上传 - advice_uploadfail: 上传已中止 - advice_uploadsuccess: 所有数据都已成功上传 - advice_waydragged: 已拖拽路径 (Z 撤销) - cancel: 取消 - closechangeset: 关闭修改集合中 - conflict_download: 下载他们的版本 - conflict_overwrite: 覆盖他们的版本 - conflict_poichanged: 自从你开始编辑时，其他人已修改了节点 $1$2。 - conflict_relchanged: 自从你开始编辑时，其他人已修改了关系 $1$2。 - conflict_visitpoi: 点击'确定'以显示路径。 - conflict_visitway: 点击'确定'以显示路径。 - conflict_waychanged: 自从你开始编辑时，其他人已修改了路径 $1$2。 - createrelation: 创建新的关系 - custom: "自定义:" - delete: 删除 - deleting: 删除中 - drag_pois: 拖拽关注点到地图上 - editinglive: 在线编辑中 - editingoffline: 离线编辑 - emailauthor: \n\n请向richard@systemeD.net发送错误报告，并说明当时您在做的动作。 - error_anonymous: 您不能联系匿名制图者。 - error_connectionfailed: 对不起 - 连接到 OpenStreetMap 的服务器失败。任何最近的修改将不会保存。\n\n您想再试一次吗? - error_microblog_long: "张贴到 $1 失败:\nHTTP 代码: $2\n错误信息: $3\n$1 错误: $4" - error_nosharedpoint: 路径 $1 和 $2 不共享一个节点了，所以我不能撤消分裂。 - error_noway: 找不到路径 $1 (也许你已将它移走了吗?)，所以我不能撤消。 - error_readfailed: 对不起 - OpenStreetMap 的服务器对数据请求没有响应。\n\n您想再试一次吗? - existingrelation: 添加到现有的关系 - findrelation: 寻找关系有包含 - gpxpleasewait: 请稍候，正在处理 GPX 轨迹。 - heading_drawing: 绘图 - heading_introduction: 简介 - heading_pois: 入门 - heading_quickref: 快速参考 - heading_surveying: 测量 - heading_tagging: 添加标签 - heading_troubleshooting: 疑难解答 - help: 帮助 - hint_drawmode: 单击以加入点\n双击/回车\n以结束线段 - hint_latlon: "纬度 $1\n经度 $2" - hint_loading: 加载数据 - hint_pointselected: 已选择节点\n(shift-点击以\n开始新路径) - hint_saving: 保存数据 - hint_saving_loading: 加载/保存数据 - inspector: 检查器 - inspector_duplicate: 重复的 - inspector_in_ways: 方式 - inspector_latlon: "纬度 $1\n经度 $2" - inspector_locked: 已锁定 - inspector_node_count: ($1 次) - inspector_not_in_any_ways: 不在任何路径中 (POI) - inspector_unsaved: 未保存 - inspector_uploading: (上传中) - inspector_way_connects_to: 连接 $1 条路径 - inspector_way_nodes: $1 个节点 - loading: 载入中…… - login_pwd: "密码:" - login_retry: 无法识别您的网站登录凭证。请再试一次。 - login_title: 无法登录 - login_uid: "用户名:" - mail: 邮件 - more: 更多 - newchangeset: "\n请重试: Potlatch 将打开一个新的修改集合。" - "no": 不 - nobackground: 无背景 - norelations: 在当前区域中没有关系 - offset_broadcanal: 广泛的运河牵道 - offset_choose: 选择偏移量 (米) - offset_dual: 双车道 (D2) - offset_motorway: 高速公路 (D3) - offset_narrowcanal: 狭窄的运河牵道 - ok: 确定 - openchangeset: 打开修改集合中 - option_custompointers: 使用笔和手的指针 - option_external: 在对外发布： - option_fadebackground: 淡化背景 - option_layer_cycle_map: OSM - cycle map - option_layer_maplint: OSM - Maplint (错误) - option_layer_nearmap: 澳大利亚： NearMap - option_layer_ooc_25k: 英国历史：1:25k - option_layer_ooc_7th: 英国历史：第7位 - option_layer_ooc_npe: 英国历史：北角 - option_layer_ooc_scotland: 英国历史：苏格兰 - option_layer_streets_haiti: 海地：街道名称 - option_layer_tip: 选择要显示的背景 - option_limitways: 加载大量数据警告 - option_microblog_id: 微博名： - option_microblog_pwd: 微博密码： - option_noname: 高亮未命名的道路 - option_photo: "照片 KML:" - option_thinareas: 为此区域使用较细的线条 - option_thinlines: 在所有缩放级别使用细线条 - option_warnings: 显示浮动警告 - point: 节点 - preset_icon_airport: 机场 - preset_icon_bar: 酒吧 - preset_icon_bus_stop: 公交停靠站 - preset_icon_cafe: 咖啡馆 - preset_icon_cinema: 电影院 - preset_icon_convenience: 便利店 - preset_icon_disaster: 海地建筑 - preset_icon_fast_food: 快餐 - preset_icon_ferry_terminal: 渡轮 - preset_icon_fire_station: 消防局 - preset_icon_hospital: 医院 - preset_icon_hotel: 酒店 - preset_icon_museum: 博物馆 - preset_icon_parking: 停车场 - preset_icon_pharmacy: 药房 - preset_icon_place_of_worship: 宗教场所 - preset_icon_police: 警察局 - preset_icon_post_box: 邮箱 - preset_icon_pub: 酒吧 - preset_icon_recycling: 回收 - preset_icon_restaurant: 餐厅 - preset_icon_school: 学校 - preset_icon_station: 火车站 - preset_icon_supermarket: 超市 - preset_icon_taxi: 出租车站 - preset_icon_telephone: 电话 - preset_icon_theatre: 剧院 - preset_tip: 从预设标签菜单中选择一个来描述 $1 - prompt_addtorelation: 添加 $1 至关系 - prompt_changesetcomment: "输入以描述您的更改:" - prompt_closechangeset: 关闭修改集合 $1 - prompt_createparallel: 创建并行的路径 - prompt_editlive: 在线编辑 - prompt_editsave: 编辑再保存 - prompt_helpavailable: 新用户?看看左下角的帮助按钮。 - prompt_launch: 启动外部 URL - prompt_live: 在在线模式下，每一个你更改的项目都将被即时保存在 OpenStreetMap 的数据库中 - 不推荐初学者使用。您确定吗? - prompt_manyways: 这一区域信息非常详细，需要很长的时间来载入。你愿意放大吗？ - prompt_microblog: 发布到$1（$2剩余） - prompt_revertversion: "恢复到先前储存的版本:" - prompt_savechanges: 保存更改 - prompt_taggedpoints: 在路径上的一些节点有标签，或是关联到了关系中。真的要删除吗? - prompt_track: 转换 GPS 轨迹至路径 - prompt_unlock: 点击解锁 - prompt_welcome: 欢迎使用 OpenStreetMap! - retry: 重试 - revert: 恢复 - save: 保存 - tags_backtolist: 返回列表 - tags_descriptions: "'$1' 的说明" - tags_findatag: 查找标签 - tags_findtag: 查找标签 - tags_typesearchterm: "输入一个词来查找:" - tip_addrelation: 添加到关系 - tip_addtag: 添加新的标签 - tip_alert: 发生错误 - 点击查看详情 - tip_anticlockwise: 逆时针循环的路径 - 点击逆转 - tip_clockwise: 顺时针环形路 - 点击以反转 - tip_direction: 路径的方向 - 点击逆转 - tip_gps: 显示 GPS 轨迹 (G) - tip_noundo: 没什么可撤消 - tip_options: 设置选项(选择地图背景) - tip_photo: 加载照片 - tip_repeattag: 从刚才的路径重复标签 (R) - tip_revertversion: 选择要恢复到的版本 - tip_selectrelation: 添加到所选的路线 - tip_splitway: 在选定的节点处分割路径 (X) - tip_tidy: 整理路径上的节点 (T) - tip_undo: 撤销 $1 (Z) - uploading: 上传中... - uploading_deleting_pois: 正在删除兴趣点 - uploading_deleting_ways: 删除路径中 - uploading_poi: 正在上传兴趣点$2 - uploading_poi_name: 正在上传兴趣点$1，$2 - uploading_relation: 上传关系 $1 中 - uploading_relation_name: 上传关系 $1, $2 中 - uploading_way: 上传路径 $1 中 - uploading_way_name: 上传路径 $1, $2 中 - warning: 警告! - way: 路径 - "yes": 是 diff --git a/config/potlatch/locales/zh-TW.yml b/config/potlatch/locales/zh-TW.yml deleted file mode 100644 index 39d8133d1..000000000 --- a/config/potlatch/locales/zh-TW.yml +++ /dev/null @@ -1,106 +0,0 @@ -# Messages for Traditional Chinese (‪中文(繁體)‬) -# Exported from translatewiki.net -# Export driver: syck-pecl -# Author: McDutchie -# Author: Wrightbus -zh-TW: - a_poi: $1 POI - a_way: $1 路徑 - action_addpoint: 在路徑的結尾加上節點 - action_cancelchanges: 取消變更： - action_createpoi: 建立一個 POI - action_deletepoint: 正在刪除 point - action_insertnode: 在路徑中加入節點 - action_mergeways: 正在合併兩條路徑 - action_movepoi: 移動 POI - action_movepoint: 移動 point - action_moveway: 移動路徑 - action_pointtags: 設定 point 上的標籤 - action_poitags: 設定 POI 上的標籤 - action_reverseway: 反轉路徑 - action_splitway: 分離一條路徑 - action_waytags: 設定路徑上的標籤 - advice_nocommonpoint: 這些路徑不再分享共同 point - advice_tagconflict: 標籤不符 - 請檢查 - advice_toolong: 路徑太長而無法解除鎖定 - 請將它分離為較短的路徑 - advice_uploadfail: 上傳已停止 - advice_waydragged: 拖曳的路徑 (按 Z 復原) - cancel: 取消 - createrelation: 建立新的關係 - custom: 自訂： - delete: 刪除 - deleting: 刪除中 - editinglive: 在線編輯 - editingoffline: 離線編輯 - emailauthor: \n\n請寄一封程式錯誤報告的電子郵件給 richard\@systemeD.net，並說明當時您在做什麼動作。 - error_connectionfailed: 抱歉 - 對 OpenStreetMap 伺服器的連線失敗了。任何最新的變更將不會儲存。\n\n您是否要再試一次？ - error_nosharedpoint: 路徑 $1 和 $2 不再分享共同 point，因此我無法復原此分離動作。 - error_noway: 找不到路徑 $1 (perhaps you've panned away?) ，因此我不能復原它。 - existingrelation: 加入既存的關係 - findrelation: 尋找關係有包含 - gpxpleasewait: 在處理 GPX 追蹤時請稍候。 - help: 求助 - hint_drawmode: 單擊加入新的 point\n雙擊/Enter\n可結束此線段 - hint_latlon: "緯度 $1\n經度 $2" - hint_loading: 正在載入路徑 - hint_overendpoint: 在結束 point 上\n單擊會製作交叉\n按 shift 再點選會合併 - hint_overpoint: 在 point 上\n單擊會製作交叉 - hint_pointselected: 已選擇一個 point\n(按 shift再點選 point 可\n開始畫新的線段) - inspector_locked: 已鎖定 - inspector_uploading: （上傳中） - loading: 正在載入... - login_pwd: 密碼： - norelations: 在目前的區域中沒有此關係 - ok: 確定 - option_fadebackground: 淡化背景 - option_thinlines: 在所有縮放等級使用細線 - option_warnings: 顯示浮動式警示 - preset_icon_airport: 機場 - preset_icon_bar: 酒吧 - preset_icon_bus_stop: 巴士站 - preset_icon_cafe: 咖啡館 - preset_icon_cinema: 電影院 - preset_icon_convenience: 便利店 - preset_icon_fast_food: 快餐 - preset_icon_ferry_terminal: 渡輪 - preset_icon_fire_station: 消防局 - preset_icon_hospital: 醫院 - preset_icon_hotel: 酒店 - preset_icon_museum: 博物館 - preset_icon_parking: 停車場 - preset_icon_pharmacy: 藥房 - preset_icon_place_of_worship: 宗教場所 - preset_icon_police: 警察局 - preset_icon_post_box: 郵箱 - preset_icon_recycling: 回收站 - preset_icon_restaurant: 食肆 - preset_icon_school: 學校 - preset_icon_station: 鐵路車站 - preset_icon_supermarket: 超級市場 - preset_icon_taxi: 出租車站 - preset_icon_telephone: 電話 - preset_icon_theatre: 劇院 - prompt_addtorelation: 將 $1 加入為關係 - prompt_helpavailable: 您有未儲存的變更。(要在 Potlatch 中儲存，您應該取消選取目前的路徑或 point。) - prompt_revertversion: "回復到較早儲存的版本:" - prompt_savechanges: 儲存變更 - prompt_taggedpoints: 這個路徑上的部分 point 已有標籤。確定要刪除？ - prompt_track: 將您的 GPS 追蹤轉換為 (鎖定的) 路徑以便編輯。 - prompt_welcome: 歡迎使用 OpenStreetMap！ - retry: 重試 - tip_addrelation: 加入關係 - tip_addtag: 加入新的標籤 - tip_alert: 發生錯誤 - 點選以取得詳細資訊 - tip_direction: 路徑的方向 - 單擊可反轉方向 - tip_gps: 顯示 GPS 追蹤 (G) - tip_noundo: 沒有可復原的項目 - tip_options: 設定選項 (選擇地圖背景) - tip_presettype: 選擇在選擇中要提供哪種類型的預先設定。 - tip_repeattag: 重複前一次選取路徑的標籤 (R) - tip_revertversion: 選擇要回復的版本 - tip_selectrelation: 加入到選取的路線 - tip_splitway: 在選取的 point 將路徑分開 (X) - tip_undo: 復原 $1 (Z) - uploading: 上傳中... - way: 路徑 - "yes": 是 diff --git a/config/potlatch/presets.txt b/config/potlatch/presets.txt deleted file mode 100644 index 0d966e925..000000000 --- a/config/potlatch/presets.txt +++ /dev/null @@ -1,227 +0,0 @@ -way/road -motorway: highway=motorway,ref=(type road number) -trunk road: highway=trunk,ref=(type road number),name=(type road name) -primary road: highway=primary,ref=(type road number),name=(type road name) -secondary road: highway=secondary,ref=(type road number),name=(type road name) -tertiary road: highway=tertiary,ref=(type road number),name=(type road name) -unclassified road: highway=unclassified,ref=,name=(type road name) -residential road: highway=residential,ref=,name=(type road name) -service road: highway=service,ref= -unknown road: highway=road - -way/footway -public footpath: highway=footway,foot=yes,tracktype= -permissive path: highway=footway,foot=permissive,tracktype= -bridleway: highway=bridleway,foot=yes,tracktype= -unofficial path: highway=path -paved track: highway=track,foot=,surface=paved -gravel track: highway=track,foot=,surface=gravel -dirt track: highway=track,foot=,surface=dirt -grass track: highway=track,foot=,surface=grass - -way/cycleway -cycle track: highway=cycleway,ncn_ref=,rcn_ref=,lcn_ref= -national route: highway=cycleway,ncn_ref=(type route number) -regional route: highway=cycleway,rcn_ref=(type route number) -local route: highway=cycleway,lcn_ref=(type route number) - -way/waterway -canal: waterway=canal,name=(type name here) -navigable river: waterway=river,boat=yes,name=(type name here) -navigable drain: waterway=drain,boat=yes,name=(type name here) -derelict canal: waterway=derelict_canal,name=(type name here) -unnavigable river: waterway=river,boat=no,name=(type name here) -unnavigable drain: waterway=drain,boat=no,name=(type name here) -stream: waterway=stream,boat=no,name=(type name here) - -way/railway -railway: railway=rail -tramway: railway=tram -light railway: railway=light_rail -preserved railway: railway=preserved -disused railway tracks: railway=disused -course of old railway: railway=abandoned -railway platform: railway=platform - -way/tourism -archaeological: place=,tourism=,historic=archaeological_site,name=(type name here) -attraction: place=,tourism=attraction,historic=,amenity=,name=(type name here) -campsite: place=,tourism=camp_site,historic=,amenity=,name=(type name here) -caravan site: place=,tourism=camp_site,historic=,amenity=,name=(type name here) -castle: place=,tourism=,historic=castle,name=(type name here) -hotel: place=,tourism=hotel,historic=,amenity=,name=(type name here),operator=(type chain here) -museum: place=,tourism=museum,historic=,amenity=,name=(type name here) -ruins: place=,tourism=,historic=ruins,name=(type name here) - -way/recreation -golf course: landuse=,leisure=golf_course -pitch: landuse=,leisure=pitch,sport=(type sport here) -playground: landuse=,leisure=playground -recreation ground: landuse=recreation_ground,leisure= -sports centre: landuse=,leisure=sports_centre -stadium: landuse=,leisure=stadium - -way/utility -college: place=,tourism=,amenity=college,name=(type name here) -school: place=,tourism=,amenity=school,name=(type name here) -hospital: place=,tourism=,amenity=hospital,name=(type name here) -library: place=,tourism=,amenity=library,name=(type name here) -university: place=,tourism=,amenity=university,name=(type name here) - -way/natural -coastline: natural=coastline,landuse=,leisure= -fell: natural=fell,landuse=,leisure= -heath: natural=heath,landuse=,leisure= -forest: landuse=forest,natural=,leisure= -marsh: natural=marsh,landuse=,leisure= -nature reserve: leisure=nature_reserve,landuse=,natural= -scree: natural=scree,landuse=,leisure= -water: natural=water,landuse=,leisure= -woodland: natural=wood,landuse=,leisure= - -way/landuse -allotments: landuse=allotments,leisure= -building site: landuse=construction,leisure= -commercial: landuse=commercial,leisure= -common: landuse=,leisure=common -farm: landuse=farm,leisure= -farmyard: landuse=farmyard,leisure= -industry: landuse=industrial,leisure= -landfill site: landuse=landfill,leisure= -park: leisure=park,landuse= -quarry: landuse=quarry,leisure= -reservoir: landuse=reservoir,leisure= -residential: landuse=residential,leisure= -retail: landuse=retail,leisure= -village green: landuse=village_green,leisure= - -point/road -mini roundabout: place=,highway=mini_roundabout -traffic lights: place=,highway=traffic_signals - -point/footway -gate: place=,barrier=gate -stile: place=,barrier=stile -cattle grid: place=,barrier=cattle_grid - -point/cycleway -bike park: place=,barrier=,amenity=bicycle_parking,capacity=(type number of spaces) -bollard: place=,barrier=bollard,amenity=,capacity= -cycle barrier: place=,barrier=cycle_barrier,amenity=,capacity= -gate: place=,barrier=gate,amenity=,capacity= - -point/waterway -lock: place=,waterway=,lock=yes,name=(type name here) -single lockgate: place=,waterway=lock_gate,lock= -weir: place=,waterway=weir,lock= -aqueduct: place=,waterway=aqueduct,lock= -winding hole: place=,waterway=turning_point,lock= -mooring: place=,waterway=mooring,lock= - -point/railway -station: place=,railway=station,name=(type name here) -viaduct: place=,railway=viaduct -road crossing: place=,railway=level_crossing -foot crossing: place=,railway=crossing - -point/landmark -pylon: man_made=,power=tower - -point/natural -peak: place=,natural=peak - -POI/road -car park: place=,amenity=parking -petrol station: place=,amenity=fuel - -POI/footway -bench: amenity=bench - -POI/cycleway -bike park: place=,shop=,amenity=bicycle_parking,capacity=(type number of spaces) -bike rental: place=,amenity=bicycle_rental,capacity=(type number of bikes) -bike shop: place=,shop=bicycle - -POI/place -city: place=city,name=(type name here),is_in=(type region or county) -town: place=town,name=(type name here),is_in=(type region or county) -suburb: place=suburb,name=(type name here),is_in=(type region or county) -village: place=village,name=(type name here),is_in=(type region or county) -hamlet: place=hamlet,name=(type name here),is_in=(type region or county) - -POI/tourism -archaeological: place=,tourism=,historic=archaeological_site,name=(type name here) -artwork: place=,tourism=artwork,historic=,amenity= -attraction: place=,tourism=attraction,historic=,amenity=,name=(type name here) -cafe: place=,tourism=,historic=,amenity=cafe,name=(type name here) -campsite: place=,tourism=camp_site,historic=,amenity=,name=(type name here) -caravan site: place=,tourism=camp_site,historic=,amenity=,name=(type name here) -castle: place=,tourism=,historic=castle,name=(type name here) -cinema: place=,tourism=,historic=,amenity=cinema,name=(type name here),operator=(type chain here) -fast food: place=,tourism=,historic=,amenity=fast_food,name=(type name here) -guesthouse: place=,tourism=guest_house,historic=,amenity=,name=(type name here) -hostel: place=,tourism=hostel,historic=,amenity=,name=(type name here),operator=(type chain here) -hotel: place=,tourism=hotel,historic=,amenity=,name=(type name here),operator=(type chain here) -monument: place=,tourism=,historic=monument,name=(type name here) -museum: place=,tourism=museum,historic=,amenity=,name=(type name here) -picnic site: place=,tourism=picnic_site,historic= -pub: place=,tourism=,historic=,amenity=pub,name=(type name here) -restaurant: place=,tourism=,historic=,amenity=restaurant,name=(type name here) -ruins: place=,tourism=,historic=ruins,name=(type name here) -viewpoint: place=,tourism=viewpoint,historic= - -POI/landmark -church: man_made=,amenity=place_of_worship,name=(type name here),religion=christian,denomination=(type denomination here),power= -other religious: man_made=,amenity=place_of_worship,name=(type name here),religion=(type religion),denomination=,power= -lighthouse: man_made=lighthouse,power=,amenity=,name=,religion=,denomination= -pylon: man_made=,power=tower,amenity=,name=,religion=,denomination= -windmill: man_made=windmill,power=,amenity=,name=,religion=,denomination= - -POI/recreation -golf course: leisure=golf_course -pitch: leisure=pitch,sport=(type sport here) -playground: leisure=playground -recreation ground: landuse=recreation_ground,leisure= -sports centre: leisure=sports_centre -stadium: leisure=stadium - -POI/shop -bank: amenity=bank,shop=,operator=(type bank name) -bike shop: amenity=,shop=bicycle,name=(type name here),operator=(type chain here) -bookshop: amenity=,shop=books,name=(type name here),operator=(type chain here) -butchers: amenity=,shop=butcher,name=(type name here),operator=(type chain here) -chemists: amenity=,shop=chemist,name=(type name here),operator=(type chain here) -convenience store: amenity=,shop=convenience,operator=(type chain here) -department store: amenity=,shop=department_store,operator=(type chain here) -DIY: amenity=,shop=doityourself,operator=(type chain here) -garden centre: amenity=,shop=garden_centre,name=(type name here),operator=(type chain here) -laundry: amenity=,shop=laundry,name=(type name here),operator=(type chain here) -off-licence: amenity=,shop=alcohol,name=(type name here),operator=(type chain here) -outdoor: amenity=,shop=outdoor,name=(type name here),operator=(type chain here) -pharmacy: amenity=pharmacy,shop=,name=(type name here),operator=(type chain here) -post office: amenity=post_office,shop=,name=(type name here) -supermarket: amenity=,shop=supermarket,operator=(type chain here) - -POI/utility -college: place=,tourism=,amenity=college,name=(type name here) -post box: place=,amenity=post_box,tourism=,name=,ref=(type code here) -recycling: place=,amenity=recycling,tourism=,name=,ref=(type code here) -school: place=,tourism=,amenity=school,name=(type name here) -surgery: place=,tourism=,amenity=doctors,name=(type name here) -hospital: place=,tourism=,amenity=hospital,name=(type name here) -library: place=,tourism=,amenity=library,name=(type name here) -phone box: place=,tourism=,amenity=telephone,name=(type name here) -toilets: place=,tourism=,amenity=toilets,name=(type name here) -university: place=,tourism=,amenity=university,name=(type name here) - -POI/natural -peak: place=,natural=peak - -point/address -address: addr:housenumber=(type house number),addr:street=(type street name),addr:postcode=(type postcode),addr:city=(type town name) - -POI/address -address: addr:housenumber=(type house number),addr:street=(type street name),addr:postcode=(type postcode),addr:city=(type town name) - -way/address -address: addr:housenumber=(type house number),addr:street=(type street name),addr:interpolation=(type pattern of house numbers),addr:postcode=(type postcode),addr:city=(type town name) diff --git a/config/potlatch/relation_colours.txt b/config/potlatch/relation_colours.txt deleted file mode 100644 index 16406e3c6..000000000 --- a/config/potlatch/relation_colours.txt +++ /dev/null @@ -1,19 +0,0 @@ -# Potlatch relations colours file -# each line must be tab-separated: tag, colour, alpha, width -#(width is currently ignored) -# an alpha of 0 will cause that relation not to be drawn - -lcn 0x0000ff 50 10 -rcn 0x28c9fe 50 10 -ncn 0xff3333 50 10 -foot 0x228022 50 10 -trail 0x228022 50 10 -hiking 0x228022 50 10 -uk_ldp 0x228022 50 10 -nwn 0x228022 50 10 -rwn 0x228022 50 10 -lwn 0x228022 50 10 -administrative 0xAD61AA 30 10 -boundary 0xAD61AA 30 10 -restriction 0x000000 0 0 -enforcement 0x000000 0 0 diff --git a/config/routes.rb b/config/routes.rb index 41dc7cfc5..8a1ea8846 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -79,10 +79,6 @@ OpenStreetMap::Application.routes.draw do get "gpx/:id/details" => "api/traces#show", :id => /\d+/ get "gpx/:id/data" => "api/traces#data", :as => :api_trace_data - # AMF (ActionScript) API - post "amf/read" => "api/amf#amf_read" - post "amf/write" => "api/amf#amf_write" - # Map notes API resources :notes, :except => [:new, :edit, :update], :constraints => { :id => /\d+/ }, :defaults => { :format => "xml" }, :controller => "api/notes" do collection do diff --git a/config/settings.yml b/config/settings.yml index 04ea9ba78..049844d3d 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -82,8 +82,6 @@ oauth_10_support: true nominatim_url: "https://nominatim.openstreetmap.org/" # Default editor default_editor: "id" -# OAuth consumer key for Potlatch 2 -#potlatch2_key: "" # OAuth consumer key for the web site #oauth_key: "" # OAuth consumer key for iD diff --git a/config/wiki_pages.yml b/config/wiki_pages.yml index 257981424..588fc630e 100644 --- a/config/wiki_pages.yml +++ b/config/wiki_pages.yml @@ -4,6 +4,7 @@ --- ar: key: + highway: Ar:Key:highway name: Ar:Key:name tag: amenity=school: Ar:Tag:amenity=school @@ -26,20 +27,42 @@ bn: highway: Bn:Key:highway tag: highway=residential: Bn:Tag:highway=residential +br: + key: + highway: Br:Key:highway ca: key: amenity: Ca:Key:amenity + building: Ca:Key:building lgbtq: Ca:Key:lgbtq name: Ca:Key:name operator:type: Ca:Key:operator:type phone: Ca:Key:phone + roundtrip: Ca:Key:roundtrip + wikidata: Ca:Key:wikidata tag: + admin_level=2: Ca:Tag:admin level=2 + advertising=wall_painting: Ca:Tag:advertising=wall painting amenity=post_box: Ca:Tag:amenity=post box + barrier=cable_barrier: Ca:Tag:barrier=cable barrier + barrier=kerb: Ca:Tag:barrier=kerb + building=boathouse: Ca:Tag:building=boathouse + building=hospital: Ca:Tag:building=hospital + building=hut: Ca:Tag:building=hut + craft=blacksmith: Ca:Tag:craft=blacksmith + crossing=traffic_signals: Ca:Tag:crossing=traffic signals + highway=residential: Ca:Tag:highway=residential landuse=farmland: Ca:Tag:landuse=farmland leisure=swimming_pool: Ca:Tag:leisure=swimming pool + leisure=tanning_salon: Ca:Tag:leisure=tanning salon + man_made=gantry: Ca:Tag:man made=gantry + name=Herfy: Ca:Tag:name=Herfy + natural=cliff: Ca:Tag:natural=cliff office=notary: Ca:Tag:office=notary place=isolated_dwelling: Ca:Tag:place=isolated dwelling + power=line: Ca:Tag:power=line shop=frozen_food: Ca:Tag:shop=frozen food + vending=books: Ca:Tag:vending=books cs: key: 3dr:type: Cs:Key:3dr:type @@ -480,6 +503,7 @@ cs: motorcar: Cs:Key:motorcar motorcycle: Cs:Key:motorcycle motorcycle:conditional: Cs:Key:motorcycle:conditional + motorcycle:tours: Cs:Key:motorcycle:tours motorhome: Cs:Key:motorhome motorroad: Cs:Key:motorroad mountain_pass: Cs:Key:mountain pass @@ -2078,6 +2102,7 @@ cs: sport=boxing: Cs:Tag:sport=boxing sport=canadian_football: Cs:Tag:sport=canadian football sport=motocross: Cs:Tag:sport=motocross + sport=orienteering: Cs:Tag:sport=orienteering station=light_rail: Cs:Tag:station=light rail station=subway: Cs:Tag:station=subway summit:cross=yes: Cs:Tag:summit:cross=yes @@ -2117,6 +2142,7 @@ cs: tower:type=watchtower: Cs:Tag:tower:type=watchtower tunnel=culvert: Cs:Tag:tunnel=culvert type=public_transport: Cs:Tag:type=public transport + type=waterway: Cs:Tag:type=waterway vending=SIM_cards: Cs:Tag:vending=SIM cards vending=admission_tickets: Cs:Tag:vending=admission tickets vending=animal_feed: Cs:Tag:vending=animal feed @@ -2220,6 +2246,7 @@ da: surface: Da:Key:surface tag: amenity=community_centre: Da:Tag:amenity=community centre + amenity=grave_yard: Da:Tag:amenity=grave yard amenity=nightclub: Da:Tag:amenity=nightclub amenity=place_of_worship: Da:Tag:amenity=place of worship amenity=veterinary: Da:Tag:amenity=veterinary @@ -2230,6 +2257,7 @@ da: highway=tertiary: Da:Tag:highway=tertiary highway=track: Da:Tag:highway=track highway=unclassified: Da:Tag:highway=unclassified + landuse=cemetery: Da:Tag:landuse=cemetery leisure=dog_park: Da:Tag:leisure=dog park place=hamlet: Da:Tag:place=hamlet place=town: Da:Tag:place=town @@ -2243,15 +2271,19 @@ de: Animal: DE:Key:Animal Annotations: DE:Key:Annotations FIXME: DE:Key:FIXME + Key:restaurant: DE:Key:Key:restaurant TODO: DE:Key:TODO VRS:ref: DE:Key:VRS:ref WDPA_ID:ref: DE:Key:WDPA ID:ref 'abandoned:': 'DE:Key:abandoned:' abandoned:*: DE:Key:abandoned:* abandoned:amenity: DE:Key:abandoned:amenity + abandoned:place: DE:Key:abandoned:place abandoned:railway: DE:Key:abandoned:railway abutters: DE:Key:abutters access: DE:Key:access + access:lanes: DE:Key:access:lanes + access:offroad: DE:Key:access:offroad addr: DE:Key:addr addr:city: DE:Key:addr:city addr:country: DE:Key:addr:country @@ -2269,18 +2301,22 @@ de: aeroway: DE:Key:aeroway after_school: DE:Key:after school agricultural: DE:Key:agricultural + alt_name: DE:Key:alt name amenity: DE:Key:amenity + architect: DE:Key:architect area: DE:Key:area artist_name: DE:Key:artist name artwork_type: DE:Key:artwork type asb: DE:Key:asb ascent: DE:Key:ascent attraction: DE:Key:attraction + atv:repair: DE:Key:atv:repair authentication: DE:Key:authentication automated: DE:Key:automated backcountry: DE:Key:backcountry backrest: DE:Key:backrest backward: DE:Key:backward + bakehouse: DE:Key:bakehouse barrier: DE:Key:barrier basin: DE:Key:basin bath:type: DE:Key:bath:type @@ -2290,13 +2326,16 @@ de: bench: DE:Key:bench bicycle: DE:Key:bicycle bicycle:backward: DE:Key:bicycle:backward + bicycle:conditional: DE:Key:bicycle:conditional bicycle_parking: DE:Key:bicycle parking bicycle_road: DE:Key:bicycle road bike_ride: DE:Key:bike ride bin: DE:Key:bin biosphärenwirt: DE:Key:biosphärenwirt + board:title: DE:Key:board:title board_type: DE:Key:board type boat: DE:Key:boat + boat:rental: DE:Key:boat:rental bollard: DE:Key:bollard books: DE:Key:books both: DE:Key:both @@ -2315,22 +2354,30 @@ de: building:levels:underground: DE:Key:building:levels:underground building:material: DE:Key:building:material building:part: DE:Key:building:part + building:use: DE:Key:building:use bulk_purchase: DE:Key:bulk purchase bunker_type: DE:Key:bunker type bus: DE:Key:bus bus_bay: DE:Key:bus bay busway: DE:Key:busway + button_operated: DE:Key:button operated cables: DE:Key:cables canoe: DE:Key:canoe capacity: DE:Key:capacity + capacity:charging: DE:Key:capacity:charging + capacity:disabled: DE:Key:capacity:disabled capital: DE:Key:capital car_wash: DE:Key:car wash caravans: DE:Key:caravans cargo: DE:Key:cargo carriage: DE:Key:carriage + cash_withdrawal: DE:Key:cash withdrawal castle_type: DE:Key:castle type cemetery: DE:Key:cemetery + changing_table: DE:Key:changing table + charge: DE:Key:charge check_date: DE:Key:check date + checkpoint: DE:Key:checkpoint circuits: DE:Key:circuits circumference: DE:Key:circumference city_limit: DE:Key:city limit @@ -2340,6 +2387,7 @@ de: cocktails: DE:Key:cocktails coffee: DE:Key:coffee collection_times: DE:Key:collection times + colour: DE:Key:colour comment: DE:Key:comment communication:amateur_radio:repeater: DE:Key:communication:amateur radio:repeater communication:bos: DE:Key:communication:bos @@ -2349,6 +2397,7 @@ de: communication:television: DE:Key:communication:television community_centre: DE:Key:community centre community_centre:for: DE:Key:community centre:for + conditional: DE:Key:conditional construction: DE:Key:construction contact: DE:Key:contact contact:email: DE:Key:contact:email @@ -2373,6 +2422,7 @@ de: crossing:light: DE:Key:crossing:light crossing:on_demand: DE:Key:crossing:on demand crossing:saltire: DE:Key:crossing:saltire + crossing_ref: DE:Key:crossing ref cuisine: DE:Key:cuisine currency: DE:Key:currency currency:BTC: DE:Key:currency:BTC @@ -2391,9 +2441,13 @@ de: delivery: DE:Key:delivery denomination: DE:Key:denomination denotation: DE:Key:denotation + departures_board: DE:Key:departures board + descent: DE:Key:descent description: DE:Key:description designation: DE:Key:designation destination: DE:Key:destination + destination:backward: DE:Key:destination:backward + destination:forward: DE:Key:destination:forward destination:ref: DE:Key:destination:ref destination:ref:lanes: DE:Key:destination:ref:lanes destination:ref:to: DE:Key:destination:ref:to @@ -2405,8 +2459,10 @@ de: diet:*: DE:Key:diet:* diet:vegan: DE:Key:diet:vegan diet:vegetarian: DE:Key:diet:vegetarian + dinner: DE:Key:dinner diplomatic: DE:Key:diplomatic direction: DE:Key:direction + dispensing: DE:Key:dispensing display: DE:Key:display distance: DE:Key:distance disused: DE:Key:disused @@ -2419,13 +2475,17 @@ de: drinking_water: DE:Key:drinking water drive_in: DE:Key:drive in drive_through: DE:Key:drive through + duration: DE:Key:duration ele: DE:Key:ele electrified: DE:Key:electrified embankment: DE:Key:embankment emergency: DE:Key:emergency + end_date: DE:Key:end date + engineer: DE:Key:engineer entrance: DE:Key:entrance facebook: DE:Key:facebook fair_trade: DE:Key:fair trade + farmyard: DE:Key:farmyard fee: DE:Key:fee fence_type: DE:Key:fence type ferry:cable: DE:Key:ferry:cable @@ -2433,6 +2493,7 @@ de: fire_hydrant: DE:Key:fire hydrant fireplace: DE:Key:fireplace fixme: DE:Key:fixme + flag:type: DE:Key:flag:type floating: DE:Key:floating foot: DE:Key:foot footway: DE:Key:footway @@ -2460,11 +2521,19 @@ de: generator:type: DE:Key:generator:type genus: DE:Key:genus geological: DE:Key:geological + golf: DE:Key:golf golf:course: DE:Key:golf:course + goods: DE:Key:goods government: DE:Key:government + grades: DE:Key:grades + grassland: DE:Key:grassland group_only: DE:Key:group only guest_house: DE:Key:guest house + handicap: DE:Key:handicap + handrail: DE:Key:handrail + happy_hours: DE:Key:happy hours harbour: DE:Key:harbour + hazard: DE:Key:hazard hazmat: DE:Key:hazmat hazmat:water: DE:Key:hazmat:water healthcare: DE:Key:healthcare @@ -2481,6 +2550,8 @@ de: historic:period: DE:Key:historic:period horse: DE:Key:horse horse_scale: DE:Key:horse scale + iata: DE:Key:iata + icao: DE:Key:icao ice_cream: DE:Key:ice cream ice_road: DE:Key:ice road image: DE:Key:image @@ -2499,21 +2570,26 @@ de: is_in:continent: DE:Key:is in:continent is_in:country: DE:Key:is in:country is_in:county: DE:Key:is in:county + isced:level: DE:Key:isced:level junction: DE:Key:junction kids_area: DE:Key:kids area kms: DE:Key:kms kneipp_water_cure: DE:Key:kneipp water cure + lamp_type: DE:Key:lamp type landfill:waste: DE:Key:landfill:waste landuse: DE:Key:landuse lanes: DE:Key:lanes lanes:backward: DE:Key:lanes:backward + lanes:both_ways: DE:Key:lanes:both ways lanes:bus: DE:Key:lanes:bus lanes:forward: DE:Key:lanes:forward lanes:psv: DE:Key:lanes:psv lanes:psv:backward: DE:Key:lanes:psv:backward lanes:psv:forward: DE:Key:lanes:psv:forward + language: DE:Key:language lawyer: DE:Key:lawyer layer: DE:Key:layer + lcn: DE:Key:lcn lcn_ref: DE:Key:lcn ref leaf_cycle: DE:Key:leaf cycle leaf_type: DE:Key:leaf type @@ -2525,6 +2601,7 @@ de: lit: DE:Key:lit living_street: DE:Key:living street loc_name: DE:Key:loc name + local_ref: DE:Key:local ref location: DE:Key:location lock: DE:Key:lock lock_name: DE:Key:lock name @@ -2532,11 +2609,13 @@ de: lockable: DE:Key:lockable lottery: DE:Key:lottery love_locks: DE:Key:love locks + lunch: DE:Key:lunch man_made: DE:Key:man made manhole: DE:Key:manhole manufacturer: DE:Key:manufacturer manufacturer:type: DE:Key:manufacturer:type mapillary: DE:Key:mapillary + marker: DE:Key:marker massage: DE:Key:massage material: DE:Key:material max_age: DE:Key:max age @@ -2545,11 +2624,14 @@ de: maxlength: DE:Key:maxlength maxspeed: DE:Key:maxspeed maxspeed:backward: DE:Key:maxspeed:backward + maxspeed:conditional: DE:Key:maxspeed:conditional maxspeed:forward: DE:Key:maxspeed:forward maxspeed:type: DE:Key:maxspeed:type + maxspeed:variable: DE:Key:maxspeed:variable maxstay: DE:Key:maxstay maxweight: DE:Key:maxweight maxwidth: DE:Key:maxwidth + maxwidth:physical: DE:Key:maxwidth:physical megalith_type: DE:Key:megalith type memorial: DE:Key:memorial memorial:type: DE:Key:memorial:type @@ -2587,6 +2669,8 @@ de: motorcycle:sales: DE:Key:motorcycle:sales motorcycle:type: DE:Key:motorcycle:type motorcycle:tyres: DE:Key:motorcycle:tyres + motorcycle_friendly: DE:Key:motorcycle friendly + motorhome: DE:Key:motorhome motorroad: DE:Key:motorroad mountain_pass: DE:Key:mountain pass mtb:scale: DE:Key:mtb:scale @@ -2600,7 +2684,9 @@ de: natural: DE:Key:natural navigationaid: DE:Key:navigationaid network: DE:Key:network + noaddress: DE:Key:noaddress noexit: DE:Key:noexit + noname: DE:Key:noname note: DE:Key:note nudism: DE:Key:nudism nursery: DE:Key:nursery @@ -2612,10 +2698,13 @@ de: old_name: DE:Key:old name oneway: DE:Key:oneway oneway:bicycle: DE:Key:oneway:bicycle + oneway:conditional: DE:Key:oneway:conditional oneway:moped: DE:Key:oneway:moped onkz: DE:Key:onkz openfire: DE:Key:openfire + opening_date: DE:Key:opening date opening_hours: DE:Key:opening hours + opening_hours:covid19: DE:Key:opening hours:covid19 opening_hours:kitchen: DE:Key:opening hours:kitchen operator: DE:Key:operator operator:MNC: DE:Key:operator:MNC @@ -2627,12 +2716,14 @@ de: outdoor_seating: DE:Key:outdoor seating overtaking: DE:Key:overtaking par: DE:Key:par + park_ride: DE:Key:park ride parking: DE:Key:parking parking:condition: DE:Key:parking:condition parking:lane: DE:Key:parking:lane parking:lane:hgv: DE:Key:parking:lane:hgv passenger_information_display: DE:Key:passenger information display payment: DE:Key:payment + permanent_camping: DE:Key:permanent camping phone: DE:Key:phone pilgrimage: DE:Key:pilgrimage piste:difficulty: DE:Key:piste:difficulty @@ -2647,6 +2738,7 @@ de: plant:source: DE:Key:plant:source playground: DE:Key:playground 'playground:': 'DE:Key:playground:' + police: DE:Key:police population: DE:Key:population post_box:type: DE:Key:post box:type post_office: DE:Key:post office @@ -2657,6 +2749,8 @@ de: preschool: DE:Key:preschool priority: DE:Key:priority priority_road: DE:Key:priority road + produce: DE:Key:produce + product: DE:Key:product proposed: DE:Key:proposed protect_class: DE:Key:protect class protected: DE:Key:protected @@ -2668,19 +2762,28 @@ de: pump: DE:Key:pump rack: DE:Key:rack railway: DE:Key:railway + railway:etcs: DE:Key:railway:etcs + railway:lzb: DE:Key:railway:lzb + railway:position: DE:Key:railway:position railway:preserved: DE:Key:railway:preserved railway:track_ref: DE:Key:railway:track ref ramp: DE:Key:ramp + 'razed:': 'DE:Key:razed:' rcn_ref: DE:Key:rcn ref + recycling:fire_extinguishers: DE:Key:recycling:fire extinguishers recycling_type: DE:Key:recycling type ref: DE:Key:ref ref:IFOPT: DE:Key:ref:IFOPT ref:bufa: DE:Key:ref:bufa ref:mobil-parken.de: DE:Key:ref:mobil-parken.de + ref_name: DE:Key:ref name reg_name: DE:Key:reg name religion: DE:Key:religion + 'removed:': 'DE:Key:removed:' reservation: DE:Key:reservation + reservoir_type: DE:Key:reservoir type resource: DE:Key:resource + restaurant: DE:Key:restaurant right: DE:Key:right roof:material: DE:Key:roof:material room: DE:Key:room @@ -2691,6 +2794,7 @@ de: ruins: DE:Key:ruins sac_scale: DE:Key:sac scale salt: DE:Key:salt + sauna: DE:Key:sauna seamark: DE:Key:seamark seamark:fixme: DE:Key:seamark:fixme seamark:type: DE:Key:seamark:type @@ -2700,7 +2804,9 @@ de: segregated: DE:Key:segregated self_service: DE:Key:self service service: DE:Key:service + service:bicycle:rental: DE:Key:service:bicycle:rental service:bicycle:repair: DE:Key:service:bicycle:repair + service:vehicle: DE:Key:service:vehicle service_times: DE:Key:service times shelter: DE:Key:shelter shelter_type: DE:Key:shelter type @@ -2710,6 +2816,7 @@ de: shower: DE:Key:shower sidewalk: DE:Key:sidewalk site_type: DE:Key:site type + ski: DE:Key:ski smoking: DE:Key:smoking smoothness: DE:Key:smoothness social_facility: DE:Key:social facility @@ -2718,6 +2825,7 @@ de: source: DE:Key:source source:maxspeed: DE:Key:source:maxspeed species: DE:Key:species + species:de: DE:Key:species:de speech_output: DE:Key:speech output speech_output:en: DE:Key:speech output:en speech_output:lg: DE:Key:speech output:lg @@ -2737,6 +2845,7 @@ de: surveillance: DE:Key:surveillance surveillance:zone: DE:Key:surveillance:zone survey:date: DE:Key:survey:date + swimming: DE:Key:swimming swimming_pool: DE:Key:swimming pool symbol: DE:Key:symbol tactile_paving: DE:Key:tactile paving @@ -2758,25 +2867,37 @@ de: tourism: DE:Key:tourism tower:construction: DE:Key:tower:construction tower:type: DE:Key:tower:type + townhall:type: DE:Key:townhall:type tracks: DE:Key:tracks tracktype: DE:Key:tracktype traffic_calming: DE:Key:traffic calming traffic_sign: DE:Key:traffic sign + traffic_signals: DE:Key:traffic signals traffic_signals:arrow: DE:Key:traffic signals:arrow traffic_signals:direction: DE:Key:traffic signals:direction traffic_signals:sound: DE:Key:traffic signals:sound + traffic_signals:vibration: DE:Key:traffic signals:vibration trail_visibility: DE:Key:trail visibility + transformer: DE:Key:transformer + tree_lined: DE:Key:tree lined trees: DE:Key:trees trolley_wire: DE:Key:trolley wire trolleybus: DE:Key:trolleybus tunnel: DE:Key:tunnel turn: DE:Key:turn + turn:backward: DE:Key:turn:backward + turn:forward: DE:Key:turn:forward turn:lanes: DE:Key:turn:lanes turn:lanes:backward: DE:Key:turn:lanes:backward turn:lanes:forward: DE:Key:turn:lanes:forward type: DE:Key:type + uic_ref: DE:Key:uic ref usage: DE:Key:usage + utility: DE:Key:utility + vaccination: DE:Key:vaccination + vacuum_cleaner: DE:Key:vacuum cleaner vehicle: DE:Key:vehicle + vehicle:conditional: DE:Key:vehicle:conditional verbindung: DE:Key:verbindung viewpoint: DE:Key:viewpoint visibility: DE:Key:visibility @@ -2796,6 +2917,7 @@ de: wikidata: DE:Key:wikidata wikimedia_commons: DE:Key:wikimedia commons wikipedia: DE:Key:wikipedia + windmill:type: DE:Key:windmill:type winter_road: DE:Key:winter road winter_service: DE:Key:winter service wires: DE:Key:wires @@ -2810,23 +2932,45 @@ de: abandoned:amenity=prison: DE:Tag:abandoned:amenity=prison abandoned:amenity=prison_camp: DE:Tag:abandoned:amenity=prison camp abandoned=yes: DE:Tag:abandoned=yes + access=agricultural: DE:Tag:access=agricultural + access=customers: DE:Tag:access=customers + access=delivery: DE:Tag:access=delivery access=designated: DE:Tag:access=designated access=destination: DE:Tag:access=destination + access=forestry: DE:Tag:access=forestry + access=no: DE:Tag:access=no access=private: DE:Tag:access=private admin_level=2: DE:Tag:admin level=2 advertising=column: DE:Tag:advertising=column + advertising=flag: DE:Tag:advertising=flag + advertising=screen: DE:Tag:advertising=screen + advertising=sculpture: DE:Tag:advertising=sculpture + advertising=sign: DE:Tag:advertising=sign + advertising=tarp: DE:Tag:advertising=tarp + advertising=wall_painting: DE:Tag:advertising=wall painting + aerialway:drag_lift=j-bar: DE:Tag:aerialway:drag lift=j-bar + aerialway:drag_lift=platter: DE:Tag:aerialway:drag lift=platter + aerialway:drag_lift=t-bar: DE:Tag:aerialway:drag lift=t-bar aerialway=cable_car: DE:Tag:aerialway=cable car + aerialway=canopy: DE:Tag:aerialway=canopy aerialway=chair_lift: DE:Tag:aerialway=chair lift aerialway=drag_lift: DE:Tag:aerialway=drag lift aerialway=gondola: DE:Tag:aerialway=gondola aerialway=goods: DE:Tag:aerialway=goods + aerialway=j-bar: DE:Tag:aerialway=j-bar aerialway=magic_carpet: DE:Tag:aerialway=magic carpet + aerialway=mixed_lift: DE:Tag:aerialway=mixed lift + aerialway=platter: DE:Tag:aerialway=platter aerialway=pylon: DE:Tag:aerialway=pylon + aerialway=rope_tow: DE:Tag:aerialway=rope tow aerialway=station: DE:Tag:aerialway=station + aerialway=t-bar: DE:Tag:aerialway=t-bar + aerialway=zip_line: DE:Tag:aerialway=zip line aerodrome:type=gliding: DE:Tag:aerodrome:type=gliding aerodrome:type=international: DE:Tag:aerodrome:type=international aerodrome:type=regional: DE:Tag:aerodrome:type=regional aeroway=aerodrome: DE:Tag:aeroway=aerodrome + aeroway=airstrip: DE:Tag:aeroway=airstrip aeroway=apron: DE:Tag:aeroway=apron aeroway=gate: DE:Tag:aeroway=gate aeroway=hangar: DE:Tag:aeroway=hangar @@ -2842,10 +2986,12 @@ de: aeroway=terminal: DE:Tag:aeroway=terminal aeroway=windsock: DE:Tag:aeroway=windsock airmark=beacon: DE:Tag:airmark=beacon + allotments=plot: DE:Tag:allotments=plot amenity=administration: DE:Tag:amenity=administration amenity=animal_boarding: DE:Tag:amenity=animal boarding amenity=animal_breeding: DE:Tag:amenity=animal breeding amenity=animal_shelter: DE:Tag:amenity=animal shelter + amenity=animal_training: DE:Tag:amenity=animal training amenity=archive: DE:Tag:amenity=archive amenity=arts_centre: DE:Tag:amenity=arts centre amenity=atm: DE:Tag:amenity=atm @@ -2871,6 +3017,7 @@ de: amenity=car_wash: DE:Tag:amenity=car wash amenity=casino: DE:Tag:amenity=casino amenity=charging_station: DE:Tag:amenity=charging station + amenity=childcare: DE:Tag:amenity=childcare amenity=cinema: DE:Tag:amenity=cinema amenity=clinic: DE:Tag:amenity=clinic amenity=clock: DE:Tag:amenity=clock @@ -2901,6 +3048,7 @@ de: amenity=fountain: DE:Tag:amenity=fountain amenity=fridge: DE:Tag:amenity=fridge amenity=fuel: DE:Tag:amenity=fuel + amenity=give_box: DE:Tag:amenity=give box amenity=grave_yard: DE:Tag:amenity=grave yard amenity=grit_bin: DE:Tag:amenity=grit bin amenity=hookah_lounge: DE:Tag:amenity=hookah lounge @@ -2909,15 +3057,20 @@ de: amenity=hunting_stand: DE:Tag:amenity=hunting stand amenity=ice_cream: DE:Tag:amenity=ice cream amenity=internet_cafe: DE:Tag:amenity=internet cafe + amenity=karaoke_box: DE:Tag:amenity=karaoke box amenity=kindergarten: DE:Tag:amenity=kindergarten amenity=kitchen: DE:Tag:amenity=kitchen amenity=kneipp_water_cure: DE:Tag:amenity=kneipp water cure amenity=language_school: DE:Tag:amenity=language school + amenity=lavoir: DE:Tag:amenity=lavoir + amenity=letter_box: DE:Tag:amenity=letter box amenity=library: DE:Tag:amenity=library + amenity=lounger: DE:Tag:amenity=lounger amenity=marketplace: DE:Tag:amenity=marketplace amenity=medical_supply: DE:Tag:amenity=medical supply amenity=monastery: DE:Tag:amenity=monastery amenity=money_transfer: DE:Tag:amenity=money transfer + amenity=mortuary: DE:Tag:amenity=mortuary amenity=motorcycle_parking: DE:Tag:amenity=motorcycle parking amenity=music_school: DE:Tag:amenity=music school amenity=music_venue: DE:Tag:amenity=music venue @@ -2926,6 +3079,7 @@ de: amenity=parking: DE:Tag:amenity=parking amenity=parking_entrance: DE:Tag:amenity=parking entrance amenity=parking_space: DE:Tag:amenity=parking space + amenity=payment_terminal: DE:Tag:amenity=payment terminal amenity=pharmacy: DE:Tag:amenity=pharmacy amenity=photo_booth: DE:Tag:amenity=photo booth amenity=place_of_worship: DE:Tag:amenity=place of worship @@ -2934,6 +3088,7 @@ de: amenity=post_box: DE:Tag:amenity=post box amenity=post_depot: DE:Tag:amenity=post depot amenity=post_office: DE:Tag:amenity=post office + amenity=prep_school: DE:Tag:amenity=prep school amenity=prison: DE:Tag:amenity=prison amenity=prison_camp: DE:Tag:amenity=prison camp amenity=pub: DE:Tag:amenity=pub @@ -2974,6 +3129,8 @@ de: amenity=youth_centre: DE:Tag:amenity=youth centre animal=horse_walker: DE:Tag:animal=horse walker animal=school: DE:Tag:animal=school + artwork_type=bust: DE:Tag:artwork type=bust + artwork_type=mural: DE:Tag:artwork type=mural artwork_type=sculpture: DE:Tag:artwork type=sculpture artwork_type=statue: DE:Tag:artwork type=statue atm=yes: DE:Tag:atm=yes @@ -2984,33 +3141,52 @@ de: attraction=water_slide: DE:Tag:attraction=water slide barrier=block: DE:Tag:barrier=block barrier=bollard: DE:Tag:barrier=bollard + barrier=bus_trap: DE:Tag:barrier=bus trap + barrier=cable_barrier: DE:Tag:barrier=cable barrier barrier=cattle_grid: DE:Tag:barrier=cattle grid + barrier=chain: DE:Tag:barrier=chain barrier=city_wall: DE:Tag:barrier=city wall barrier=cycle_barrier: DE:Tag:barrier=cycle barrier + barrier=debris: DE:Tag:barrier=debris barrier=ditch: DE:Tag:barrier=ditch barrier=entrance: DE:Tag:barrier=entrance barrier=fence: DE:Tag:barrier=fence barrier=full-height_turnstile: DE:Tag:barrier=full-height turnstile barrier=gate: DE:Tag:barrier=gate barrier=guard_rail: DE:Tag:barrier=guard rail + barrier=handrail: DE:Tag:barrier=handrail barrier=hedge: DE:Tag:barrier=hedge barrier=hedge_bank: DE:Tag:barrier=hedge bank barrier=height_restrictor: DE:Tag:barrier=height restrictor + barrier=jersey_barrier: DE:Tag:barrier=jersey barrier barrier=kerb: DE:Tag:barrier=kerb barrier=kissing_gate: DE:Tag:barrier=kissing gate barrier=lift_gate: DE:Tag:barrier=lift gate + barrier=log: DE:Tag:barrier=log + barrier=motorcycle_barrier: DE:Tag:barrier=motorcycle barrier barrier=retaining_wall: DE:Tag:barrier=retaining wall + barrier=rope: DE:Tag:barrier=rope barrier=sally_port: DE:Tag:barrier=sally port + barrier=sliding_gate: DE:Tag:barrier=sliding gate + barrier=spikes: DE:Tag:barrier=spikes barrier=stile: DE:Tag:barrier=stile + barrier=swing_gate: DE:Tag:barrier=swing gate + barrier=tank_trap: DE:Tag:barrier=tank trap barrier=toll_booth: DE:Tag:barrier=toll booth barrier=turnstile: DE:Tag:barrier=turnstile barrier=wall: DE:Tag:barrier=wall + barrier=wicket_gate: DE:Tag:barrier=wicket gate + basin=detention: DE:Tag:basin=detention + basin=infiltration: DE:Tag:basin=infiltration + basin=retention: DE:Tag:basin=retention bath:type=hammam: DE:Tag:bath:type=hammam bath:type=thermal: DE:Tag:bath:type=thermal bay=fjord: DE:Tag:bay=fjord bicycle=designated: DE:Tag:bicycle=designated + bicycle=dismount: DE:Tag:bicycle=dismount bicycle=use_sidepath: DE:Tag:bicycle=use sidepath biosphärenwirt=yes: DE:Tag:biosphärenwirt=yes + boundary=marker: DE:Tag:boundary=marker boundary=national_park: DE:Tag:boundary=national park boundary=postal_code: DE:Tag:boundary=postal code boundary=protected_area: DE:Tag:boundary=protected area @@ -3036,34 +3212,46 @@ de: bridge=covered: DE:Tag:bridge=covered bridge=trestle: DE:Tag:bridge=trestle bridge=viaduct: DE:Tag:bridge=viaduct + building=allotment_house: DE:Tag:building=allotment house building=apartments: DE:Tag:building=apartments + building=bakehouse: DE:Tag:building=bakehouse building=barn: DE:Tag:building=barn building=boathouse: DE:Tag:building=boathouse building=bungalow: DE:Tag:building=bungalow + building=bunker: DE:Tag:building=bunker + building=cabin: DE:Tag:building=cabin building=cathedral: DE:Tag:building=cathedral building=chapel: DE:Tag:building=chapel building=church: DE:Tag:building=church building=civic: DE:Tag:building=civic building=commercial: DE:Tag:building=commercial + building=construction: DE:Tag:building=construction building=container: DE:Tag:building=container building=cowshed: DE:Tag:building=cowshed building=detached: DE:Tag:building=detached + building=digester: DE:Tag:building=digester building=dormitory: DE:Tag:building=dormitory building=entrance: DE:Tag:building=entrance building=farm: DE:Tag:building=farm + building=farm_auxiliary: DE:Tag:building=farm auxiliary + building=fire_station: DE:Tag:building=fire station building=garage: DE:Tag:building=garage building=garages: DE:Tag:building=garages + building=gatehouse: DE:Tag:building=gatehouse building=grandstand: DE:Tag:building=grandstand building=greenhouse: DE:Tag:building=greenhouse + building=hangar: DE:Tag:building=hangar building=hospital: DE:Tag:building=hospital building=hotel: DE:Tag:building=hotel building=house: DE:Tag:building=house building=houseboat: DE:Tag:building=houseboat building=hut: DE:Tag:building=hut building=industrial: DE:Tag:building=industrial + building=kindergarten: DE:Tag:building=kindergarten building=kiosk: DE:Tag:building=kiosk building=marquee: DE:Tag:building=marquee building=mosque: DE:Tag:building=mosque + building=office: DE:Tag:building=office building=parking: DE:Tag:building=parking building=pavilion: DE:Tag:building=pavilion building=public: DE:Tag:building=public @@ -3073,17 +3261,22 @@ de: building=roof: DE:Tag:building=roof building=ruins: DE:Tag:building=ruins building=school: DE:Tag:building=school + building=semidetached_house: DE:Tag:building=semidetached house + building=service: DE:Tag:building=service building=shed: DE:Tag:building=shed building=shrine: DE:Tag:building=shrine building=slurry_tank: DE:Tag:building=slurry tank building=sports_hall: DE:Tag:building=sports hall building=stable: DE:Tag:building=stable + building=stadium: DE:Tag:building=stadium building=static_caravan: DE:Tag:building=static caravan building=sty: DE:Tag:building=sty + building=supermarket: DE:Tag:building=supermarket building=synagogue: DE:Tag:building=synagogue building=tech_cab: DE:Tag:building=tech cab building=temple: DE:Tag:building=temple building=terrace: DE:Tag:building=terrace + building=toilets: DE:Tag:building=toilets building=train_station: DE:Tag:building=train station building=university: DE:Tag:building=university building=warehouse: DE:Tag:building=warehouse @@ -3091,6 +3284,7 @@ de: bunker_type=hardened_aircraft_shelter: DE:Tag:bunker type=hardened aircraft shelter bunker_type=munitions: DE:Tag:bunker type=munitions bunker_type=pillbox: DE:Tag:bunker type=pillbox + by_night=only: DE:Tag:by night=only castle_type=castrum: DE:Tag:castle type=castrum castle_type=defensive: DE:Tag:castle type=defensive castle_type=fortress: DE:Tag:castle type=fortress @@ -3098,24 +3292,32 @@ de: castle_type=palace: DE:Tag:castle type=palace castle_type=stately: DE:Tag:castle type=stately cemetery=grave: DE:Tag:cemetery=grave + cemetery=war_cemetery: DE:Tag:cemetery=war cemetery club=automobile: DE:Tag:club=automobile club=fan: DE:Tag:club=fan club=scout: DE:Tag:club=scout club=sport: DE:Tag:club=sport communication=line: DE:Tag:communication=line construction=yes: DE:Tag:construction=yes + content=hot_water: DE:Tag:content=hot water craft=agricultural_engines: DE:Tag:craft=agricultural engines + craft=atelier: DE:Tag:craft=atelier + craft=bakery: DE:Tag:craft=bakery craft=basket_maker: DE:Tag:craft=basket maker craft=beekeeper: DE:Tag:craft=beekeeper craft=blacksmith: DE:Tag:craft=blacksmith craft=boatbuilder: DE:Tag:craft=boatbuilder craft=bookbinder: DE:Tag:craft=bookbinder + craft=brewery: DE:Tag:craft=brewery craft=builder: DE:Tag:craft=builder + craft=cabinet_maker: DE:Tag:craft=cabinet maker + craft=car_painter: DE:Tag:craft=car painter craft=car_repair: DE:Tag:craft=car repair craft=carpenter: DE:Tag:craft=carpenter craft=carpet_layer: DE:Tag:craft=carpet layer craft=caterer: DE:Tag:craft=caterer craft=chimney_sweeper: DE:Tag:craft=chimney sweeper + craft=clockmaker: DE:Tag:craft=clockmaker craft=confectionery: DE:Tag:craft=confectionery craft=cooper: DE:Tag:craft=cooper craft=dental_technician: DE:Tag:craft=dental technician @@ -3123,27 +3325,42 @@ de: craft=dressmaker: DE:Tag:craft=dressmaker craft=electrican: DE:Tag:craft=electrican craft=electrician: DE:Tag:craft=electrician + craft=electronics_repair: DE:Tag:craft=electronics repair + craft=embroiderer: DE:Tag:craft=embroiderer + craft=engraver: DE:Tag:craft=engraver craft=floorer: DE:Tag:craft=floorer craft=gardener: DE:Tag:craft=gardener craft=glaziery: DE:Tag:craft=glaziery + craft=goldsmith: DE:Tag:craft=goldsmith + craft=grinding_mill: DE:Tag:craft=grinding mill craft=handicraft: DE:Tag:craft=handicraft craft=hvac: DE:Tag:craft=hvac craft=information_electronics: DE:Tag:craft=information electronics + craft=insulation: DE:Tag:craft=insulation craft=joiner: DE:Tag:craft=joiner + craft=key_cutter: DE:Tag:craft=key cutter craft=metal_construction: DE:Tag:craft=metal construction + craft=musical_instrument: DE:Tag:craft=musical instrument + craft=oil_mill: DE:Tag:craft=oil mill craft=optician: DE:Tag:craft=optician craft=organ_builder: DE:Tag:craft=organ builder craft=painter: DE:Tag:craft=painter craft=paperhanger: DE:Tag:craft=paperhanger craft=parquet_layer: DE:Tag:craft=parquet layer + craft=paver: DE:Tag:craft=paver craft=photographer: DE:Tag:craft=photographer + craft=photographic_laboratory: DE:Tag:craft=photographic laboratory + craft=plasterer: DE:Tag:craft=plasterer craft=plumber: DE:Tag:craft=plumber craft=pottery: DE:Tag:craft=pottery craft=roofer: DE:Tag:craft=roofer craft=saddler: DE:Tag:craft=saddler craft=sawmill: DE:Tag:craft=sawmill craft=scaffolder: DE:Tag:craft=scaffolder + craft=sculptor: DE:Tag:craft=sculptor craft=shoemaker: DE:Tag:craft=shoemaker + craft=signmaker: DE:Tag:craft=signmaker + craft=stand_builder: DE:Tag:craft=stand builder craft=stonemason: DE:Tag:craft=stonemason craft=sun_protection: DE:Tag:craft=sun protection craft=tailor: DE:Tag:craft=tailor @@ -3153,13 +3370,22 @@ de: craft=turner: DE:Tag:craft=turner craft=upholsterer: DE:Tag:craft=upholsterer craft=watchmaker: DE:Tag:craft=watchmaker + craft=water_well_drilling: DE:Tag:craft=water well drilling + craft=welder: DE:Tag:craft=welder craft=window_construction: DE:Tag:craft=window construction craft=winery: DE:Tag:craft=winery crane:type=floor-mounted_crane: DE:Tag:crane:type=floor-mounted crane crane:type=gantry_crane: DE:Tag:crane:type=gantry crane crane:type=portal_crane: DE:Tag:crane:type=portal crane crane:type=travel_lift: DE:Tag:crane:type=travel lift + crossing=marked: DE:Tag:crossing=marked + crossing=traffic_signals: DE:Tag:crossing=traffic signals + crossing=uncontrolled: DE:Tag:crossing=uncontrolled + crossing=unmarked: DE:Tag:crossing=unmarked + crossing=zebra: DE:Tag:crossing=zebra + cuisine=brazilian: DE:Tag:cuisine=brazilian cuisine=coffee_shop: DE:Tag:cuisine=coffee shop + cuisine=dessert: DE:Tag:cuisine=dessert cycleway:left=lane: DE:Tag:cycleway:left=lane cycleway:right=lane: DE:Tag:cycleway:right=lane cycleway:right=track: DE:Tag:cycleway:right=track @@ -3180,31 +3406,45 @@ de: diplomatic=high_commission: DE:Tag:diplomatic=high commission diplomatic=honorary_consulate: DE:Tag:diplomatic=honorary consulate diplomatic=permanent_mission: DE:Tag:diplomatic=permanent mission + disc_golf=basket: DE:Tag:disc golf=basket + disc_golf=hole: DE:Tag:disc golf=hole dock=drydock: DE:Tag:dock=drydock dock=floating: DE:Tag:dock=floating + electrified=contact_line: DE:Tag:electrified=contact line emergency=access_point: DE:Tag:emergency=access point emergency=aed: DE:Tag:emergency=aed emergency=ambulance_station: DE:Tag:emergency=ambulance station emergency=assembly_point: DE:Tag:emergency=assembly point emergency=defibrillator: DE:Tag:emergency=defibrillator + emergency=drinking_water: DE:Tag:emergency=drinking water + emergency=dry_riser_inlet: DE:Tag:emergency=dry riser inlet emergency=emergency_ward_entrance: DE:Tag:emergency=emergency ward entrance + emergency=fire_extinguisher: DE:Tag:emergency=fire extinguisher + emergency=fire_flapper: DE:Tag:emergency=fire flapper + emergency=fire_hose: DE:Tag:emergency=fire hose emergency=fire_hydrant: DE:Tag:emergency=fire hydrant + emergency=fire_point_stand: DE:Tag:emergency=fire point stand + emergency=fire_sand_bin: DE:Tag:emergency=fire sand bin emergency=fire_water_pond: DE:Tag:emergency=fire water pond emergency=first_aid: DE:Tag:emergency=first aid emergency=first_aid_kit: DE:Tag:emergency=first aid kit + emergency=landing_site: DE:Tag:emergency=landing site emergency=life_ring: DE:Tag:emergency=life ring emergency=lifeguard_base: DE:Tag:emergency=lifeguard base emergency=lifeguard_place: DE:Tag:emergency=lifeguard place + emergency=lifeguard_platform: DE:Tag:emergency=lifeguard platform emergency=lifeguard_tower: DE:Tag:emergency=lifeguard tower emergency=mountain_rescue: DE:Tag:emergency=mountain rescue emergency=phone: DE:Tag:emergency=phone emergency=siren: DE:Tag:emergency=siren emergency=suction_point: DE:Tag:emergency=suction point emergency=water_rescue_station: DE:Tag:emergency=water rescue station + emergency=water_tank: DE:Tag:emergency=water tank emergency_service=technical: DE:Tag:emergency service=technical entrance=main: DE:Tag:entrance=main entrance=staircase: DE:Tag:entrance=staircase entrance=yes: DE:Tag:entrance=yes + fast_food=cafeteria: DE:Tag:fast food=cafeteria foot=designated: DE:Tag:foot=designated footway=crossing: DE:Tag:footway=crossing footway=sidewalk: DE:Tag:footway=sidewalk @@ -3232,10 +3472,12 @@ de: generator:source=biogas: DE:Tag:generator:source=biogas generator:source=biomass: DE:Tag:generator:source=biomass generator:source=coal: DE:Tag:generator:source=coal + generator:source=diesel: DE:Tag:generator:source=diesel generator:source=gas: DE:Tag:generator:source=gas generator:source=geothermal: DE:Tag:generator:source=geothermal generator:source=hydro: DE:Tag:generator:source=hydro generator:source=nuclear: DE:Tag:generator:source=nuclear + generator:source=oil: DE:Tag:generator:source=oil generator:source=osmotic: DE:Tag:generator:source=osmotic generator:source=solar: DE:Tag:generator:source=solar generator:source=tidal: DE:Tag:generator:source=tidal @@ -3266,25 +3508,47 @@ de: golf=green: DE:Tag:golf=green golf=hole: DE:Tag:golf=hole golf=lateral_water_hazard: DE:Tag:golf=lateral water hazard + golf=penalty_area: DE:Tag:golf=penalty area golf=pin: DE:Tag:golf=pin golf=rough: DE:Tag:golf=rough golf=tee: DE:Tag:golf=tee golf=water_hazard: DE:Tag:golf=water hazard + government=administrative: DE:Tag:government=administrative government=archive: DE:Tag:government=archive + government=audit: DE:Tag:government=audit + government=border_control: DE:Tag:government=border control government=cadaster: DE:Tag:government=cadaster government=customs: DE:Tag:government=customs + government=education: DE:Tag:government=education government=healthcare: DE:Tag:government=healthcare + government=legislative: DE:Tag:government=legislative government=ministry: DE:Tag:government=ministry government=prosecutor: DE:Tag:government=prosecutor government=register_office: DE:Tag:government=register office government=statistics: DE:Tag:government=statistics government=tax: DE:Tag:government=tax government=youth_welfare_department: DE:Tag:government=youth welfare department + hazard=animal_crossing: DE:Tag:hazard=animal crossing + hazard=children: DE:Tag:hazard=children + hazard=cyclists: DE:Tag:hazard=cyclists + hazard=falling_rocks: DE:Tag:hazard=falling rocks + hazard=minefield: DE:Tag:hazard=minefield + hazard=queues_likely: DE:Tag:hazard=queues likely + hazard=school_zone: DE:Tag:hazard=school zone + hazard=side_winds: DE:Tag:hazard=side winds + hazard=slippery: DE:Tag:hazard=slippery hazmat:water=permissive: DE:Tag:hazmat:water=permissive + healthcare=birthing_center: DE:Tag:healthcare=birthing center healthcare=blood_donation: DE:Tag:healthcare=blood donation + healthcare=clinic: DE:Tag:healthcare=clinic healthcare=dentist: DE:Tag:healthcare=dentist + healthcare=dialysis: DE:Tag:healthcare=dialysis + healthcare=doctor: DE:Tag:healthcare=doctor + healthcare=hospice: DE:Tag:healthcare=hospice + healthcare=hospital: DE:Tag:healthcare=hospital healthcare=laboratory: DE:Tag:healthcare=laboratory healthcare=physiotherapist: DE:Tag:healthcare=physiotherapist + healthcare=speech_therapist: DE:Tag:healthcare=speech therapist highway=abandoned: DE:Tag:highway=abandoned highway=access: DE:Tag:highway=access highway=bridleway: DE:Tag:highway=bridleway @@ -3335,9 +3599,9 @@ de: highway=street_light: DE:Tag:highway=street light highway=tertiary: DE:Tag:highway=tertiary highway=tertiary_link: DE:Tag:highway=tertiary link + highway=toll_gantry: DE:Tag:highway=toll gantry highway=track: DE:Tag:highway=track highway=traffic_mirror: DE:Tag:highway=traffic mirror - highway=traffic_sign: DE:Tag:highway=traffic sign highway=traffic_signals: DE:Tag:highway=traffic signals highway=trunk: DE:Tag:highway=trunk highway=trunk_link: DE:Tag:highway=trunk link @@ -3351,6 +3615,7 @@ de: historic=battlefield: DE:Tag:historic=battlefield historic=bomb_crater: DE:Tag:historic=bomb crater historic=boundary_stone: DE:Tag:historic=boundary stone + historic=building: DE:Tag:historic=building historic=cannon: DE:Tag:historic=cannon historic=castle: DE:Tag:historic=castle historic=charcoal_pile: DE:Tag:historic=charcoal pile @@ -3368,9 +3633,11 @@ de: historic=monument: DE:Tag:historic=monument historic=optical_telegraph: DE:Tag:historic=optical telegraph historic=pillory: DE:Tag:historic=pillory + historic=ruins: DE:Tag:historic=ruins historic=rune_stone: DE:Tag:historic=rune stone historic=ship: DE:Tag:historic=ship historic=stone: DE:Tag:historic=stone + historic=tank: DE:Tag:historic=tank historic=tomb: DE:Tag:historic=tomb historic=wayside_cross: DE:Tag:historic=wayside cross historic=wayside_shrine: DE:Tag:historic=wayside shrine @@ -3378,6 +3645,7 @@ de: horse=designated: DE:Tag:horse=designated industrial=bakery: DE:Tag:industrial=bakery industrial=scrap_yard: DE:Tag:industrial=scrap yard + industrial=slaughterhouse: DE:Tag:industrial=slaughterhouse information=audioguide: DE:Tag:information=audioguide information=board: DE:Tag:information=board information=guidepost: DE:Tag:information=guidepost @@ -3386,6 +3654,7 @@ de: information=tactile_map: DE:Tag:information=tactile map information=tactile_model: DE:Tag:information=tactile model information=terminal: DE:Tag:information=terminal + information=visitor_centre: DE:Tag:information=visitor centre internet_access=wlan: DE:Tag:internet access=wlan junction=roundabout: DE:Tag:junction=roundabout landuse=allotments: DE:Tag:landuse=allotments @@ -3396,6 +3665,7 @@ de: landuse=commercial: DE:Tag:landuse=commercial landuse=construction: DE:Tag:landuse=construction landuse=depot: DE:Tag:landuse=depot + landuse=education: DE:Tag:landuse=education landuse=farm: DE:Tag:landuse=farm landuse=farmland: DE:Tag:landuse=farmland landuse=farmyard: DE:Tag:landuse=farmyard @@ -3423,16 +3693,23 @@ de: landuse=salt_pond: DE:Tag:landuse=salt pond landuse=village_green: DE:Tag:landuse=village green landuse=vineyard: DE:Tag:landuse=vineyard + lcn=yes: DE:Tag:lcn=yes leaf_cycle=deciduous: DE:Tag:leaf cycle=deciduous leaf_cycle=evergreen: DE:Tag:leaf cycle=evergreen + leaf_cycle=mixed: DE:Tag:leaf cycle=mixed + leaf_cycle=semi_deciduous: DE:Tag:leaf cycle=semi deciduous + leaf_cycle=semi_evergreen: DE:Tag:leaf cycle=semi evergreen leaf_type=broadleaved: DE:Tag:leaf type=broadleaved leaf_type=leafless: DE:Tag:leaf type=leafless leaf_type=mixed: DE:Tag:leaf type=mixed leaf_type=needleleaved: DE:Tag:leaf type=needleleaved leisure=adult_gaming_centre: DE:Tag:leisure=adult gaming centre + leisure=amusement_arcade: DE:Tag:leisure=amusement arcade leisure=bandstand: DE:Tag:leisure=bandstand + leisure=barefoot: DE:Tag:leisure=barefoot leisure=beach_resort: DE:Tag:leisure=beach resort leisure=bird_hide: DE:Tag:leisure=bird hide + leisure=bleachers: DE:Tag:leisure=bleachers leisure=bowling_alley: DE:Tag:leisure=bowling alley leisure=common: DE:Tag:leisure=common leisure=dance: DE:Tag:leisure=dance @@ -3446,6 +3723,7 @@ de: leisure=foot_bath: DE:Tag:leisure=foot bath leisure=garden: DE:Tag:leisure=garden leisure=golf_course: DE:Tag:leisure=golf course + leisure=hackerspace: DE:Tag:leisure=hackerspace leisure=horse_riding: DE:Tag:leisure=horse riding leisure=hot_spring: DE:Tag:leisure=hot spring leisure=ice_rink: DE:Tag:leisure=ice rink @@ -3453,6 +3731,7 @@ de: leisure=miniature_golf: DE:Tag:leisure=miniature golf leisure=nature_reserve: DE:Tag:leisure=nature reserve leisure=outdoor_seating: DE:Tag:leisure=outdoor seating + leisure=paddling_pool: DE:Tag:leisure=paddling pool leisure=park: DE:Tag:leisure=park leisure=picnic_table: DE:Tag:leisure=picnic table leisure=pitch: DE:Tag:leisure=pitch @@ -3476,6 +3755,8 @@ de: level_crossing=uncontrolled: DE:Tag:level crossing=uncontrolled line=bay: DE:Tag:line=bay line=busbar: DE:Tag:line=busbar + location:transition=yes: DE:Tag:location:transition=yes + location=underground: DE:Tag:location=underground man_made=MDF: DE:Tag:man made=MDF man_made=adit: DE:Tag:man made=adit man_made=antenna: DE:Tag:man made=antenna @@ -3484,6 +3765,7 @@ de: man_made=breakwater: DE:Tag:man made=breakwater man_made=bridge: DE:Tag:man made=bridge man_made=bunker_silo: DE:Tag:man made=bunker silo + man_made=carpet_hanger: DE:Tag:man made=carpet hanger man_made=chimney: DE:Tag:man made=chimney man_made=communications_tower: DE:Tag:man made=communications tower man_made=cooling_tower: DE:Tag:man made=cooling tower @@ -3514,13 +3796,18 @@ de: man_made=pier: DE:Tag:man made=pier man_made=pipeline: DE:Tag:man made=pipeline man_made=power_wind: DE:Tag:man made=power wind + man_made=pumping_rig: DE:Tag:man made=pumping rig man_made=pumping_station: DE:Tag:man made=pumping station + man_made=quay: DE:Tag:man made=quay man_made=reservoir_covered: DE:Tag:man made=reservoir covered man_made=satellite_dish: DE:Tag:man made=satellite dish man_made=silo: DE:Tag:man made=silo man_made=snow_cannon: DE:Tag:man made=snow cannon + man_made=snow_fence: DE:Tag:man made=snow fence man_made=spoil_heap: DE:Tag:man made=spoil heap + man_made=spring_box: DE:Tag:man made=spring box man_made=storage_tank: DE:Tag:man made=storage tank + man_made=street_cabinet: DE:Tag:man made=street cabinet man_made=surveillance: DE:Tag:man made=surveillance man_made=survey_point: DE:Tag:man made=survey point man_made=telescope: DE:Tag:man made=telescope @@ -3534,7 +3821,11 @@ de: man_made=watermill: DE:Tag:man made=watermill man_made=wildlife_crossing: DE:Tag:man made=wildlife crossing man_made=windmill: DE:Tag:man made=windmill + man_made=windpump: DE:Tag:man made=windpump man_made=works: DE:Tag:man made=works + manhole=drain: DE:Tag:manhole=drain + marker=aerial: DE:Tag:marker=aerial + marker=post: DE:Tag:marker=post megalith_type=alignment: DE:Tag:megalith type=alignment megalith_type=chamber: DE:Tag:megalith type=chamber megalith_type=cist: DE:Tag:megalith type=cist @@ -3548,6 +3839,7 @@ de: megalith_type=tholos: DE:Tag:megalith type=tholos memorial:type=stolperstein: DE:Tag:memorial:type=stolperstein memorial=bust: DE:Tag:memorial=bust + memorial=ghost_bike: DE:Tag:memorial=ghost bike memorial=obelisk: DE:Tag:memorial=obelisk memorial=plaque: DE:Tag:memorial=plaque memorial=statue: DE:Tag:memorial=statue @@ -3564,6 +3856,7 @@ de: military=range: DE:Tag:military=range military=training_area: DE:Tag:military=training area motorcycle:type=scooter: DE:Tag:motorcycle:type=scooter + museum=archaeological: DE:Tag:museum=archaeological museum=children: DE:Tag:museum=children museum=history: DE:Tag:museum=history museum=local: DE:Tag:museum=local @@ -3571,6 +3864,7 @@ de: museum=open_air: DE:Tag:museum=open air museum=railway: DE:Tag:museum=railway natural=anthill: DE:Tag:natural=anthill + natural=arch: DE:Tag:natural=arch natural=arete: DE:Tag:natural=arete natural=bare_rock: DE:Tag:natural=bare rock natural=bay: DE:Tag:natural=bay @@ -3579,6 +3873,7 @@ de: natural=cave_entrance: DE:Tag:natural=cave entrance natural=cliff: DE:Tag:natural=cliff natural=coastline: DE:Tag:natural=coastline + natural=col: DE:Tag:natural=col natural=earth_bank: DE:Tag:natural=earth bank natural=fell: DE:Tag:natural=fell natural=geyser: DE:Tag:natural=geyser @@ -3616,6 +3911,7 @@ de: natural=water: DE:Tag:natural=water natural=wetland: DE:Tag:natural=wetland natural=wood: DE:Tag:natural=wood + network:type=node_network: DE:Tag:network:type=node network network=Flinkster: DE:Tag:network=Flinkster network=call-a-bike: DE:Tag:network=call-a-bike network=cambio/stadtmobil: DE:Tag:network=cambio/stadtmobil @@ -3631,21 +3927,28 @@ de: network=rcn: DE:Tag:network=rcn network=rhn: DE:Tag:network=rhn network=rwn: DE:Tag:network=rwn + network=stadtradhamburg: DE:Tag:network=stadtradhamburg observatory:type=astronomical: DE:Tag:observatory:type=astronomical + observatory:type=gravitational: DE:Tag:observatory:type=gravitational office=accountant: DE:Tag:office=accountant office=administrative: DE:Tag:office=administrative office=adoption_agency: DE:Tag:office=adoption agency office=advertising_agency: DE:Tag:office=advertising agency office=architect: DE:Tag:office=architect office=association: DE:Tag:office=association + office=chamber: DE:Tag:office=chamber office=charity: DE:Tag:office=charity + office=company: DE:Tag:office=company office=diplomatic: DE:Tag:office=diplomatic + office=educational_institution: DE:Tag:office=educational institution office=employment_agency: DE:Tag:office=employment agency office=energy_supplier: DE:Tag:office=energy supplier + office=engineer: DE:Tag:office=engineer office=estate_agent: DE:Tag:office=estate agent office=forestry: DE:Tag:office=forestry office=geodesist: DE:Tag:office=geodesist office=government: DE:Tag:office=government + office=graphic_design: DE:Tag:office=graphic design office=guide: DE:Tag:office=guide office=insurance: DE:Tag:office=insurance office=lawyer: DE:Tag:office=lawyer @@ -3658,8 +3961,13 @@ de: office=research: DE:Tag:office=research office=surveyor: DE:Tag:office=surveyor office=tax_advisor: DE:Tag:office=tax advisor + office=telecommunication: DE:Tag:office=telecommunication office=therapist: DE:Tag:office=therapist office=travel_agent: DE:Tag:office=travel agent + office=water_utility: DE:Tag:office=water utility + oneway=-1: DE:Tag:oneway=-1 + oneway=alternating: DE:Tag:oneway=alternating + oneway=reversible: DE:Tag:oneway=reversible operator=Cambio: DE:Tag:operator=Cambio operator=CiteeCar: DE:Tag:operator=CiteeCar operator=Drive_Carsharing: DE:Tag:operator=Drive Carsharing @@ -3672,6 +3980,7 @@ de: park_ride: DE:Tag:park ride parking:lane:hgv=on_street: DE:Tag:parking:lane:hgv=on street parking=multi-storey: DE:Tag:parking=multi-storey + parking=street_side: DE:Tag:parking=street side parking=underground: DE:Tag:parking=underground pipeline=marker: DE:Tag:pipeline=marker pipeline=substation: DE:Tag:pipeline=substation @@ -3679,9 +3988,11 @@ de: piste:type=nordic: DE:Tag:piste:type=nordic place=archipelago: DE:Tag:place=archipelago place=city: DE:Tag:place=city + place=city_block: DE:Tag:place=city block place=continent: DE:Tag:place=continent place=country: DE:Tag:place=country place=county: DE:Tag:place=county + place=farm: DE:Tag:place=farm place=hamlet: DE:Tag:place=hamlet place=island: DE:Tag:place=island place=islet: DE:Tag:place=islet @@ -3689,12 +4000,15 @@ de: place=locality: DE:Tag:place=locality place=municipality: DE:Tag:place=municipality place=neighbourhood: DE:Tag:place=neighbourhood + place=quarter: DE:Tag:place=quarter + place=region: DE:Tag:place=region place=square: DE:Tag:place=square place=state: DE:Tag:place=state place=suburb: DE:Tag:place=suburb place=town: DE:Tag:place=town place=village: DE:Tag:place=village placement=transition: DE:Tag:placement=transition + plant:method=water-storage: DE:Tag:plant:method=water-storage plant:source=biomass: DE:Tag:plant:source=biomass plant:source=coal: DE:Tag:plant:source=coal plant:source=gas: DE:Tag:plant:source=gas @@ -3704,6 +4018,19 @@ de: plant:source=solar: DE:Tag:plant:source=solar plant:source=waste: DE:Tag:plant:source=waste plant:source=wind: DE:Tag:plant:source=wind + plant:type=combined_cycle: DE:Tag:plant:type=combined cycle + plant:type=steam_turbine: DE:Tag:plant:type=steam turbine + police=academy: DE:Tag:police=academy + police=barracks: DE:Tag:police=barracks + police=car_pound: DE:Tag:police=car pound + police=checkpoint: DE:Tag:police=checkpoint + police=detention: DE:Tag:police=detention + police=naval_base: DE:Tag:police=naval base + police=offices: DE:Tag:police=offices + police=range: DE:Tag:police=range + police=storage: DE:Tag:police=storage + police=training_area: DE:Tag:police=training area + police=yes: DE:Tag:police=yes power=cable: DE:Tag:power=cable power=cable_distribution_cabinet: DE:Tag:power=cable distribution cabinet power=converter: DE:Tag:power=converter @@ -3727,6 +4054,7 @@ de: public_transport=stop_area: DE:Tag:public transport=stop area public_transport=stop_position: DE:Tag:public transport=stop position pump=manual: DE:Tag:pump=manual + pump=no: DE:Tag:pump=no pump=powered: DE:Tag:pump=powered railway=abandoned: DE:Tag:railway=abandoned railway=buffer_stop: DE:Tag:railway=buffer stop @@ -3735,6 +4063,7 @@ de: railway=disused: DE:Tag:railway=disused railway=funicular: DE:Tag:railway=funicular railway=halt: DE:Tag:railway=halt + railway=junction: DE:Tag:railway=junction railway=level_crossing: DE:Tag:railway=level crossing railway=light_rail: DE:Tag:railway=light rail railway=milestone: DE:Tag:railway=milestone @@ -3755,22 +4084,29 @@ de: railway=subway_entrance: DE:Tag:railway=subway entrance railway=switch: DE:Tag:railway=switch railway=tram: DE:Tag:railway=tram + railway=tram_level_crossing: DE:Tag:railway=tram level crossing railway=tram_stop: DE:Tag:railway=tram stop railway=traverser: DE:Tag:railway=traverser railway=turntable: DE:Tag:railway=turntable railway=wash: DE:Tag:railway=wash railway=water_tower: DE:Tag:railway=water tower railway=yard: DE:Tag:railway=yard + recycling_type=centre: DE:Tag:recycling type=centre + recycling_type=container: DE:Tag:recycling type=container religion=buddhist: DE:Tag:religion=buddhist religion=christian: DE:Tag:religion=christian religion=hindu: DE:Tag:religion=hindu religion=jewish: DE:Tag:religion=jewish religion=muslim: DE:Tag:religion=muslim religion=shinto: DE:Tag:religion=shinto + rental=ski: DE:Tag:rental=ski rental=strandkorb: DE:Tag:rental=strandkorb + repair=assisted_self_service: DE:Tag:repair=assisted self service + residential=urban: DE:Tag:residential=urban roller_coaster=track: DE:Tag:roller coaster=track route=bicycle: DE:Tag:route=bicycle route=bus: DE:Tag:route=bus + route=detour: DE:Tag:route=detour route=ferry: DE:Tag:route=ferry route=fitness_trail: DE:Tag:route=fitness trail route=foot: DE:Tag:route=foot @@ -3778,6 +4114,7 @@ de: route=horse: DE:Tag:route=horse route=inline_skates: DE:Tag:route=inline skates route=light_rail: DE:Tag:route=light rail + route=monorail: DE:Tag:route=monorail route=mtb: DE:Tag:route=mtb route=nordic_walking: DE:Tag:route=nordic walking route=pipeline: DE:Tag:route=pipeline @@ -3791,6 +4128,7 @@ de: route=train: DE:Tag:route=train route=tram: DE:Tag:route=tram route=trolleybus: DE:Tag:route=trolleybus + seamark:type=mooring: DE:Tag:seamark:type=mooring seamark:type=rock: DE:Tag:seamark:type=rock service=aircraft_control: DE:Tag:service=aircraft control service=alley: DE:Tag:service=alley @@ -3803,6 +4141,7 @@ de: service=yard: DE:Tag:service=yard shelter_type=basic_hut: DE:Tag:shelter type=basic hut shelter_type=lean_to: DE:Tag:shelter type=lean to + shelter_type=public_transport: DE:Tag:shelter type=public transport shop=agrarian: DE:Tag:shop=agrarian shop=alcohol: DE:Tag:shop=alcohol shop=antiques: DE:Tag:shop=antiques @@ -3846,6 +4185,7 @@ de: shop=deli: DE:Tag:shop=deli shop=department_store: DE:Tag:shop=department store shop=doityourself: DE:Tag:shop=doityourself + shop=doors: DE:Tag:shop=doors shop=dry_cleaning: DE:Tag:shop=dry cleaning shop=electronics: DE:Tag:shop=electronics shop=equestrian: DE:Tag:shop=equestrian @@ -3868,6 +4208,7 @@ de: shop=gift: DE:Tag:shop=gift shop=golf: DE:Tag:shop=golf shop=greengrocer: DE:Tag:shop=greengrocer + shop=grocery: DE:Tag:shop=grocery shop=haberdashery: DE:Tag:shop=haberdashery shop=hairdresser: DE:Tag:shop=hairdresser shop=hairdresser_supply: DE:Tag:shop=hairdresser supply @@ -3876,8 +4217,10 @@ de: shop=hearing_aids: DE:Tag:shop=hearing aids shop=herbalist: DE:Tag:shop=herbalist shop=hifi: DE:Tag:shop=hifi + shop=hobby: DE:Tag:shop=hobby shop=houseware: DE:Tag:shop=houseware shop=hunting: DE:Tag:shop=hunting + shop=hvac: DE:Tag:shop=hvac shop=ice_cream: DE:Tag:shop=ice cream shop=interior_decoration: DE:Tag:shop=interior decoration shop=jewelry: DE:Tag:shop=jewelry @@ -3886,18 +4229,23 @@ de: shop=lamps: DE:Tag:shop=lamps shop=laundry: DE:Tag:shop=laundry shop=leather: DE:Tag:shop=leather + shop=lighting: DE:Tag:shop=lighting shop=locksmith: DE:Tag:shop=locksmith + shop=lottery: DE:Tag:shop=lottery shop=mall: DE:Tag:shop=mall shop=massage: DE:Tag:shop=massage shop=medical_supply: DE:Tag:shop=medical supply shop=mobile_phone: DE:Tag:shop=mobile phone shop=model: DE:Tag:shop=model + shop=money_lender: DE:Tag:shop=money lender shop=motorcycle: DE:Tag:shop=motorcycle shop=music: DE:Tag:shop=music shop=musical_instrument: DE:Tag:shop=musical instrument shop=newsagent: DE:Tag:shop=newsagent + shop=nutrition_supplements: DE:Tag:shop=nutrition supplements shop=optician: DE:Tag:shop=optician shop=outdoor: DE:Tag:shop=outdoor + shop=outpost: DE:Tag:shop=outpost shop=paint: DE:Tag:shop=paint shop=party: DE:Tag:shop=party shop=pastry: DE:Tag:shop=pastry @@ -3907,11 +4255,13 @@ de: shop=pet_grooming: DE:Tag:shop=pet grooming shop=photo: DE:Tag:shop=photo shop=pottery: DE:Tag:shop=pottery + shop=radiotechnics: DE:Tag:shop=radiotechnics shop=religion: DE:Tag:shop=religion shop=robot: DE:Tag:shop=robot shop=scuba_diving: DE:Tag:shop=scuba diving shop=seafood: DE:Tag:shop=seafood shop=second_hand: DE:Tag:shop=second hand + shop=security: DE:Tag:shop=security shop=sewing: DE:Tag:shop=sewing shop=shoes: DE:Tag:shop=shoes shop=spare_parts: DE:Tag:shop=spare parts @@ -3933,6 +4283,7 @@ de: shop=trophy: DE:Tag:shop=trophy shop=tyres: DE:Tag:shop=tyres shop=vacant: DE:Tag:shop=vacant + shop=vacuum_cleaner: DE:Tag:shop=vacuum cleaner shop=variety_store: DE:Tag:shop=variety store shop=video: DE:Tag:shop=video shop=video_games: DE:Tag:shop=video games @@ -3971,24 +4322,45 @@ de: sport=badminton: DE:Tag:sport=badminton sport=baseball: DE:Tag:sport=baseball sport=basketball: DE:Tag:sport=basketball + sport=beachvolleyball: DE:Tag:sport=beachvolleyball + sport=billiards: DE:Tag:sport=billiards sport=bmx: DE:Tag:sport=bmx sport=bobsleigh: DE:Tag:sport=bobsleigh + sport=boules: DE:Tag:sport=boules + sport=bowls: DE:Tag:sport=bowls + sport=canoe: DE:Tag:sport=canoe sport=chess: DE:Tag:sport=chess + sport=cliff_diving: DE:Tag:sport=cliff diving sport=climbing: DE:Tag:sport=climbing sport=climbing_adventure: DE:Tag:sport=climbing adventure + sport=cricket: DE:Tag:sport=cricket + sport=croquet: DE:Tag:sport=croquet + sport=curling: DE:Tag:sport=curling + sport=cycling: DE:Tag:sport=cycling + sport=darts: DE:Tag:sport=darts + sport=dog_racing: DE:Tag:sport=dog racing sport=equestrian: DE:Tag:sport=equestrian sport=fencing: DE:Tag:sport=fencing sport=free_flying: DE:Tag:sport=free flying + sport=futsal: DE:Tag:sport=futsal sport=golf: DE:Tag:sport=golf sport=handball: DE:Tag:sport=handball sport=horse_racing: DE:Tag:sport=horse racing + sport=ice_hockey: DE:Tag:sport=ice hockey sport=ice_skating: DE:Tag:sport=ice skating + sport=ice_stock: DE:Tag:sport=ice stock sport=judo: DE:Tag:sport=judo sport=karting: DE:Tag:sport=karting + sport=korfball: DE:Tag:sport=korfball + sport=model_aerodrome: DE:Tag:sport=model aerodrome sport=motocross: DE:Tag:sport=motocross sport=motor: DE:Tag:sport=motor sport=multi: DE:Tag:sport=multi + sport=nine_mens_morris: DE:Tag:sport=nine mens morris + sport=orienteering: DE:Tag:sport=orienteering + sport=pelota: DE:Tag:sport=pelota sport=rc_car: DE:Tag:sport=rc car + sport=rugby: DE:Tag:sport=rugby sport=running: DE:Tag:sport=running sport=sailing: DE:Tag:sport=sailing sport=scuba_diving: DE:Tag:sport=scuba diving @@ -4010,12 +4382,28 @@ de: substation=traction: DE:Tag:substation=traction substation=transmission: DE:Tag:substation=transmission summit:cross=yes: DE:Tag:summit:cross=yes + surface=artificial_turf: DE:Tag:surface=artificial turf surface=asphalt: DE:Tag:surface=asphalt + surface=clay: DE:Tag:surface=clay + surface=cobblestone: DE:Tag:surface=cobblestone + surface=concrete: DE:Tag:surface=concrete + surface=concrete:lanes: DE:Tag:surface=concrete:lanes + surface=paving_stones: DE:Tag:surface=paving stones + surface=sett: DE:Tag:surface=sett + surface=tartan: DE:Tag:surface=tartan + surface=unhewn_cobblestone: DE:Tag:surface=unhewn cobblestone + surface=unpaved: DE:Tag:surface=unpaved + switch=circuit_breaker: DE:Tag:switch=circuit breaker + switch=disconnector: DE:Tag:switch=disconnector + switch=mechanical: DE:Tag:switch=mechanical telecom=exchange: DE:Tag:telecom=exchange telescope:type=optical: DE:Tag:telescope:type=optical telescope:type=radio: DE:Tag:telescope:type=radio theatre:type=amphi: DE:Tag:theatre:type=amphi theatre:type=open_air: DE:Tag:theatre:type=open air + tomb=cenotaph: DE:Tag:tomb=cenotaph + tomb=mausoleum: DE:Tag:tomb=mausoleum + tomb=tumulus: DE:Tag:tomb=tumulus tomb=war_grave: DE:Tag:tomb=war grave tourism=alpine_hut: DE:Tag:tourism=alpine hut tourism=apartment: DE:Tag:tourism=apartment @@ -4060,6 +4448,15 @@ de: tower:type=radar: DE:Tag:tower:type=radar tower:type=siren: DE:Tag:tower:type=siren tower:type=watchtower: DE:Tag:tower:type=watchtower + traffic_calming=dynamic_bump: DE:Tag:traffic calming=dynamic bump + traffic_calming=island: DE:Tag:traffic calming=island + traffic_calming=table: DE:Tag:traffic calming=table + 'traffic_sign=DE:': 'DE:Tag:traffic sign=DE:' + traffic_sign=DE:1022-10: DE:Tag:traffic sign=DE:1022-10 + traffic_sign=DE:124: DE:Tag:traffic sign=DE:124 + traffic_sign=DE:136-10: DE:Tag:traffic sign=DE:136-10 + traffic_sign=DE:142-10: DE:Tag:traffic sign=DE:142-10 + traffic_sign=DE:142.10: DE:Tag:traffic sign=DE:142.10 traffic_sign=DE:205: DE:Tag:traffic sign=DE:205 traffic_sign=DE:206: DE:Tag:traffic sign=DE:206 traffic_sign=DE:220-10: DE:Tag:traffic sign=DE:220-10 @@ -4099,19 +4496,41 @@ de: traffic_sign=DE:274-70: DE:Tag:traffic sign=DE:274-70 traffic_sign=DE:274-80: DE:Tag:traffic sign=DE:274-80 traffic_sign=DE:274.1: DE:Tag:traffic sign=DE:274.1 + traffic_sign=DE:274.1-20: DE:Tag:traffic sign=DE:274.1-20 traffic_sign=DE:274.2: DE:Tag:traffic sign=DE:274.2 + traffic_sign=DE:274.2-20: DE:Tag:traffic sign=DE:274.2-20 traffic_sign=DE:282: DE:Tag:traffic sign=DE:282 traffic_sign=DE:306: DE:Tag:traffic sign=DE:306 + traffic_sign=DE:310: DE:Tag:traffic sign=DE:310 traffic_sign=DE:325: DE:Tag:traffic sign=DE:325 traffic_sign=DE:325.1: DE:Tag:traffic sign=DE:325.1 traffic_sign=DE:325.2: DE:Tag:traffic sign=DE:325.2 + traffic_sign=DE:330.1: DE:Tag:traffic sign=DE:330.1 + traffic_sign=DE:330.2: DE:Tag:traffic sign=DE:330.2 + traffic_sign=DE:331.1: DE:Tag:traffic sign=DE:331.1 + traffic_sign=DE:331.2: DE:Tag:traffic sign=DE:331.2 + traffic_sign=DE:350: DE:Tag:traffic sign=DE:350 + traffic_sign=DE:350-10: DE:Tag:traffic sign=DE:350-10 + traffic_sign=DE:350-20: DE:Tag:traffic sign=DE:350-20 + traffic_sign=DE:350-40: DE:Tag:traffic sign=DE:350-40 + traffic_sign=DE:354: DE:Tag:traffic sign=DE:354 traffic_sign=DE:357: DE:Tag:traffic sign=DE:357 + traffic_sign=DE:385: DE:Tag:traffic sign=DE:385 traffic_sign=DE:386.3: DE:Tag:traffic sign=DE:386.3 + traffic_sign=DE:394-50: DE:Tag:traffic sign=DE:394-50 + traffic_sign=DE:437: DE:Tag:traffic sign=DE:437 + traffic_sign=DE:438: DE:Tag:traffic sign=DE:438 + traffic_sign=DE:439: DE:Tag:traffic sign=DE:439 traffic_sign=DE:448: DE:Tag:traffic sign=DE:448 traffic_sign=DE:449: DE:Tag:traffic sign=DE:449 + traffic_sign=DE:453: DE:Tag:traffic sign=DE:453 traffic_sign=city_limit: DE:Tag:traffic sign=city limit + transformer=distribution: DE:Tag:transformer=distribution + tunnel=building_passage: DE:Tag:tunnel=building passage tunnel=culvert: DE:Tag:tunnel=culvert + type=waterway: DE:Tag:type=waterway usage=headrace: DE:Tag:usage=headrace + usage=industrial: DE:Tag:usage=industrial usage=irrigation: DE:Tag:usage=irrigation usage=penstock: DE:Tag:usage=penstock usage=tailrace: DE:Tag:usage=tailrace @@ -4139,12 +4558,15 @@ de: vending=public_transport_tickets: DE:Tag:vending=public transport tickets vending=sex_toys: DE:Tag:vending=sex toys vending=stamps: DE:Tag:vending=stamps + vending=sweets: DE:Tag:vending=sweets vending=toys: DE:Tag:vending=toys vending=water: DE:Tag:vending=water vending_machine=fuel: DE:Tag:vending machine=fuel wall=castle_wall: DE:Tag:wall=castle wall wall=dry_stone: DE:Tag:wall=dry stone wall=noise_barrier: DE:Tag:wall=noise barrier + waste=dog_excrement: DE:Tag:waste=dog excrement + water=basin: DE:Tag:water=basin water=canal: DE:Tag:water=canal water=lagoon: DE:Tag:water=lagoon water=lake: DE:Tag:water=lake @@ -4162,6 +4584,7 @@ de: waterway=ditch: DE:Tag:waterway=ditch waterway=dock: DE:Tag:waterway=dock waterway=drain: DE:Tag:waterway=drain + waterway=fairway: DE:Tag:waterway=fairway waterway=fish_pass: DE:Tag:waterway=fish pass waterway=fuel: DE:Tag:waterway=fuel waterway=lock_gate: DE:Tag:waterway=lock gate @@ -4170,6 +4593,7 @@ de: waterway=river: DE:Tag:waterway=river waterway=riverbank: DE:Tag:waterway=riverbank waterway=stream: DE:Tag:waterway=stream + waterway=tidal_channel: DE:Tag:waterway=tidal channel waterway=waterfall: DE:Tag:waterway=waterfall waterway=weir: DE:Tag:waterway=weir wetland=bog: DE:Tag:wetland=bog @@ -4180,6 +4604,7 @@ de: wetland=reedbed: DE:Tag:wetland=reedbed wetland=saltern: DE:Tag:wetland=saltern wetland=saltmarsh: DE:Tag:wetland=saltmarsh + wetland=string_bog: DE:Tag:wetland=string bog wetland=swamp: DE:Tag:wetland=swamp wetland=tidalflat: DE:Tag:wetland=tidalflat wetland=wet_meadow: DE:Tag:wetland=wet meadow @@ -4243,7 +4668,6 @@ en: EHAK:code: Key:EHAK:code EH_ref: Key:EH ref FIXME: Key:FIXME - Fetish: Key:Fetish Finance_agent: Key:Finance agent HE_ref: Key:HE ref HU:ed_direction: Key:HU:ed direction @@ -4256,7 +4680,15 @@ en: INEGI: Key:INEGI INEGI:CVE_MUN: Key:INEGI:CVE MUN INEGI:MUNID: Key:INEGI:MUNID + ISO3166-2: Key:ISO3166-2 + KKR:code: Key:KKR:code + LINZ2OSM:dataset: Key:LINZ2OSM:dataset + LINZ2OSM:layer: Key:LINZ2OSM:layer + LINZ2OSM:source_version: Key:LINZ2OSM:source version + LINZ:layer: Key:LINZ:layer + LINZ:source_version: Key:LINZ:source version Lock_ref: Key:Lock ref + Mapper: Key:Mapper NHS: Key:NHS PMSA_ref: Key:PMSA ref Power_supply:schedule: Key:Power supply:schedule @@ -4264,21 +4696,21 @@ en: RLIS:reviewed: Key:RLIS:reviewed Schalansky_ref: Key:Schalansky ref Shop: Key:Shop + Source: Key:Source TMC: Key:TMC TMC:Direction: Key:TMC:Direction TMC:LocationCode: Key:TMC:LocationCode TMC:NextLocationCode: Key:TMC:NextLocationCode TMC:PrevLocationCode: Key:TMC:PrevLocationCode TODO: Key:TODO - Touring: Key:Touring URL: Key:URL WDPA_ID:ref: Key:WDPA ID:ref WLAN: Key:WLAN - Wikipedia: Key:Wikipedia abandoned: Key:abandoned 'abandoned:': 'Key:abandoned:' abandoned:*: Key:abandoned:* abandoned:amenity: Key:abandoned:amenity + abandoned:building: Key:abandoned:building abandoned:place: Key:abandoned:place abandoned:railway: Key:abandoned:railway abutters: Key:abutters @@ -4293,15 +4725,22 @@ en: addr: Key:addr addr:alternatenumber: Key:addr:alternatenumber addr:block: Key:addr:block + addr:block:ar: Key:addr:block:ar + addr:block:en: Key:addr:block:en addr:borough: Key:addr:borough addr:city: Key:addr:city + addr:city:ar: Key:addr:city:ar addr:city:de: Key:addr:city:de addr:city:en: Key:addr:city:en addr:city:it: Key:addr:city:it addr:city:simc: Key:addr:city:simc addr:conscriptionnumber: Key:addr:conscriptionnumber addr:country: Key:addr:country + addr:description: Key:addr:description + addr:description:ar: Key:addr:description:ar addr:district: Key:addr:district + addr:district:ar: Key:addr:district:ar + addr:district:en: Key:addr:district:en addr:door: Key:addr:door addr:flats: Key:addr:flats addr:floor: Key:addr:floor @@ -4310,28 +4749,37 @@ en: addr:hamlet:de: Key:addr:hamlet:de addr:hamlet:it: Key:addr:hamlet:it addr:housename: Key:addr:housename + addr:housename:ar: Key:addr:housename:ar addr:housenumber: Key:addr:housenumber + addr:housenumber:ar: Key:addr:housenumber:ar addr:inclusion: Key:addr:inclusion addr:interpolation: Key:addr:interpolation - addr:municipality: Key:addr:municipality addr:place: Key:addr:place + addr:place:ar: Key:addr:place:ar addr:place:de: Key:addr:place:de + addr:place:en: Key:addr:place:en addr:place:it: Key:addr:place:it addr:postcode: Key:addr:postcode addr:province: Key:addr:province + addr:province:ar: Key:addr:province:ar + addr:province:en: Key:addr:province:en addr:provisionalnumber: Key:addr:provisionalnumber addr:region: Key:addr:region addr:staircase: Key:addr:staircase addr:state: Key:addr:state addr:street: Key:addr:street + addr:street:ar: Key:addr:street:ar addr:street:de: Key:addr:street:de addr:street:en: Key:addr:street:en addr:street:it: Key:addr:street:it addr:street:name: Key:addr:street:name addr:street:prefix: Key:addr:street:prefix + addr:street:sym_ul: Key:addr:street:sym ul addr:street:type: Key:addr:street:type addr:streetnumber: Key:addr:streetnumber addr:subdistrict: Key:addr:subdistrict + addr:subdistrict:ar: Key:addr:subdistrict:ar + addr:subdistrict:en: Key:addr:subdistrict:en addr:suburb: Key:addr:suburb addr:unit: Key:addr:unit admin_level: Key:admin level @@ -4349,24 +4797,39 @@ en: airconditioned: Key:airconditioned alt_name: Key:alt name alt_name:ar: Key:alt name:ar + alt_name:azb: Key:alt name:azb alt_name:be: Key:alt name:be + alt_name:ckb: Key:alt name:ckb alt_name:en: Key:alt name:en + alt_name:fa: Key:alt name:fa + alt_name:glk: Key:alt name:glk alt_name:ko: Key:alt name:ko + alt_name:ks: Key:alt name:ks + alt_name:lrc: Key:alt name:lrc alt_name:mg: Key:alt name:mg + alt_name:mzn: Key:alt name:mzn alt_name:pl: Key:alt name:pl + alt_name:pnb: Key:alt name:pnb + alt_name:ps: Key:alt name:ps alt_name:ru: Key:alt name:ru + alt_name:sd: Key:alt name:sd alt_name:th: Key:alt name:th + alt_name:ug: Key:alt name:ug + alt_name:ur: Key:alt name:ur alt_name_1: Key:alt name 1 amenity: Key:amenity amenity:eftpos: Key:amenity:eftpos amenity:restaurant: Key:amenity:restaurant animal: Key:animal animated: Key:animated + aquaculture: Key:aquaculture architect: Key:architect architect:wikidata: Key:architect:wikidata architect:wikipedia: Key:architect:wikipedia area: Key:area + area:aeroway: Key:area:aeroway area:highway: Key:area:highway + artist: Key:artist artist:wikidata: Key:artist:wikidata artist_name: Key:artist name artwork_subject: Key:artwork subject @@ -4382,17 +4845,28 @@ en: asset_ref: Key:asset ref assisted_trail: Key:assisted trail at_bev:addr_date: Key:at bev:addr date + atmotorway: Key:atmotorway attraction: Key:attraction attribution: Key:attribution atv: Key:atv + atv:repair: Key:atv:repair atv:sales: Key:atv:sales authentication: Key:authentication + authentication:app: Key:authentication:app + authentication:membership_card: Key:authentication:membership card + authentication:nfc: Key:authentication:nfc + authentication:none: Key:authentication:none + authentication:phone_call: Key:authentication:phone call + authentication:short_message: Key:authentication:short message autoaws: Key:autoaws automated: Key:automated automatic_door: Key:automatic door + autonomy: Key:autonomy + baby_feeding: Key:baby feeding backcountry: Key:backcountry backrest: Key:backrest backward: Key:backward + bakehouse: Key:bakehouse balcony: Key:balcony bar: Key:bar barrier: Key:barrier @@ -4405,13 +4879,20 @@ en: beacon:colour: Key:beacon:colour beacon:function: Key:beacon:function beacon:type: Key:beacon:type + beauty: Key:beauty beds: Key:beds bell_tower: Key:bell tower bench: Key:bench + bench:type: Key:bench:type bicycle: Key:bicycle + bicycle:backward: Key:bicycle:backward bicycle:class:mtb: Key:bicycle:class:mtb bicycle:class:mtb:technical: Key:bicycle:class:mtb:technical bicycle:conditional: Key:bicycle:conditional + bicycle:designated:type: Key:bicycle:designated:type + bicycle:forward: Key:bicycle:forward + bicycle:oneway: Key:bicycle:oneway + bicycle:type: Key:bicycle:type bicycle_parking: Key:bicycle parking bicycle_road: Key:bicycle road bike_ride: Key:bike ride @@ -4421,21 +4902,26 @@ en: biotic_reef:type: Key:biotic reef:type blind:website: Key:blind:website blind:website:lg: Key:blind:website:lg + board:title: Key:board:title board_type: Key:board type boat: Key:boat bollard: Key:bollard booking: Key:booking books: Key:books border_type: Key:border type + bot: Key:bot both: Key:both bottle: Key:bottle bottom:material: Key:bottom:material boundary: Key:boundary boundary_type: Key:boundary type branch: Key:branch + branch:type: Key:branch:type brand: Key:brand + brand:ar: Key:brand:ar brand:wikidata: Key:brand:wikidata brand:wikipedia: Key:brand:wikipedia + brand:wikipedia:ar: Key:brand:wikipedia:ar breakfast: Key:breakfast brewery: Key:brewery bridge: Key:bridge @@ -4443,6 +4929,7 @@ en: bridge:loc_name: Key:bridge:loc name bridge:movable: Key:bridge:movable bridge:name: Key:bridge:name + bridge:name:ar: Key:bridge:name:ar bridge:official_name: Key:bridge:official name bridge:old_name: Key:bridge:old name bridge:ref: Key:bridge:ref @@ -4451,7 +4938,9 @@ en: bridge:support: Key:bridge:support bridge_name: Key:bridge name building: Key:building + building:age: Key:building:age building:architecture: Key:building:architecture + building:cladding: Key:building:cladding building:colour: Key:building:colour building:condition: Key:building:condition building:cullis:height: Key:building:cullis:height @@ -4459,6 +4948,7 @@ en: building:fireproof: Key:building:fireproof building:flats: Key:building:flats building:height: Key:building:height + building:level:1,2,3...: Key:building:level:1,2,3... building:levels: Key:building:levels building:levels:underground: Key:building:levels:underground building:material: Key:building:material @@ -4466,16 +4956,23 @@ en: building:obm: Key:building:obm building:part: Key:building:part building:place: Key:building:place + building:prefabricated: Key:building:prefabricated building:roof: Key:building:roof building:roof:colour: Key:building:roof:colour + building:roof:shape: Key:building:roof:shape building:ruian:type: Key:building:ruian:type building:soft_storey: Key:building:soft storey + building:structure: Key:building:structure building:units: Key:building:units building:usage:pl: Key:building:usage:pl building:use: Key:building:use + building:use:pl: Key:building:use:pl + building:use:residential: Key:building:use:residential + building:walls: Key:building:walls bulk_purchase: Key:bulk purchase bunker_type: Key:bunker type bus: Key:bus + bus:lanes: Key:bus:lanes bus_bay: Key:bus bay busbar: Key:busbar busway: Key:busway @@ -4487,27 +4984,43 @@ en: cable_number: Key:cable number cables: Key:cables cafe: Key:cafe + callsign: Key:callsign camp_site: Key:camp site camp_type: Key:camp type campers: Key:campers + camping: Key:camping + camra: Key:camra canal: Key:canal canoe: Key:canoe capacity: Key:capacity capacity:charging: Key:capacity:charging capacity:disabled: Key:capacity:disabled + capacity:men: Key:capacity:men capacity:parent: Key:capacity:parent + capacity:seats: Key:capacity:seats capacity:women: Key:capacity:women capital: Key:capital capital_city: Key:capital city - car: Key:car + car:sales: Key:car:sales + car:tyres: Key:car:tyres car_wash: Key:car wash caravan: Key:caravan caravans: Key:caravans cargo: Key:cargo - cargo:container: Key:cargo:container + cargo_bike: Key:cargo bike + carpenter: Key:carpenter carriage: Key:carriage carriageway_ref: Key:carriageway ref casemate: Key:casemate + cash_withdrawal: Key:cash withdrawal + cash_withdrawal:currency: Key:cash withdrawal:currency + cash_withdrawal:fee: Key:cash withdrawal:fee + cash_withdrawal:foreign_cards: Key:cash withdrawal:foreign cards + cash_withdrawal:limit: Key:cash withdrawal:limit + cash_withdrawal:operator: Key:cash withdrawal:operator + cash_withdrawal:purchase_minimum: Key:cash withdrawal:purchase minimum + cash_withdrawal:purchase_required: Key:cash withdrawal:purchase required + cash_withdrawal:type: Key:cash withdrawal:type castle_type: Key:castle type castle_type:cs: Key:castle type:cs castle_type:de: Key:castle type:de @@ -4515,6 +5028,7 @@ en: cave:ref: Key:cave:ref cemetery: Key:cemetery cemt: Key:cemt + census:population: Key:census:population center_turn_lane: Key:center turn lane centralkey: Key:centralkey centre_turn_lane: Key:centre turn lane @@ -4545,6 +5059,7 @@ en: climbing:*: Key:climbing:* climbing:rock: Key:climbing:rock clli: Key:clli + closed:note: Key:closed:note clothes: Key:clothes club: Key:club club-mate: Key:club-mate @@ -4558,6 +5073,8 @@ en: colour: Key:colour comment: Key:comment communication:amateur_radio: Key:communication:amateur radio + communication:amateur_radio:callsign: Key:communication:amateur radio:callsign + communication:amateur_radio:link: Key:communication:amateur radio:link communication:amateur_radio:repeater: Key:communication:amateur radio:repeater communication:amateur_radio:repeater:ctcss: Key:communication:amateur radio:repeater:ctcss communication:amateur_radio:repeater:dcs: Key:communication:amateur radio:repeater:dcs @@ -4575,6 +5092,8 @@ en: community: Key:community community_centre: Key:community centre community_centre:for: Key:community centre:for + company: Key:company + compressed_air: Key:compressed air condition: Key:condition conditional: Key:conditional condo: Key:condo @@ -4584,7 +5103,9 @@ en: construction_end_expected: Key:construction end expected construction_start_expected: Key:construction start expected consulate: Key:consulate + consulting: Key:consulting contact: Key:contact + contact:city: Key:contact:city contact:diaspora: Key:contact:diaspora contact:email: Key:contact:email contact:facebook: Key:contact:facebook @@ -4593,13 +5114,17 @@ en: contact:foursquare: Key:contact:foursquare contact:gnusocial: Key:contact:gnusocial contact:google_plus: Key:contact:google plus + contact:housenumber: Key:contact:housenumber contact:instagram: Key:contact:instagram contact:linkedin: Key:contact:linkedin contact:mastodon: Key:contact:mastodon contact:mobile: Key:contact:mobile + contact:ok: Key:contact:ok contact:phone: Key:contact:phone contact:pinterest: Key:contact:pinterest + contact:postcode: Key:contact:postcode contact:skype: Key:contact:skype + contact:street: Key:contact:street contact:telegram: Key:contact:telegram contact:twitter: Key:contact:twitter contact:vhf: Key:contact:vhf @@ -4613,6 +5138,7 @@ en: contact:youtube: Key:contact:youtube content: Key:content conveying: Key:conveying + cooker: Key:cooker country: Key:country covered: Key:covered craft: Key:craft @@ -4640,6 +5166,8 @@ en: currency:USD: Key:currency:USD currency:XXX: Key:currency:XXX currency:others: Key:currency:others + curve: Key:curve + curves: Key:curves cutting: Key:cutting cyclability: Key:cyclability cycle: Key:cycle @@ -4651,12 +5179,17 @@ en: cycleway:buffer: Key:cycleway:buffer cycleway:lane: Key:cycleway:lane cycleway:left: Key:cycleway:left + cycleway:left:lane: Key:cycleway:left:lane cycleway:left:oneway: Key:cycleway:left:oneway cycleway:left=backward: Key:cycleway:left=backward cycleway:right: Key:cycleway:right + cycleway:right:lane: Key:cycleway:right:lane cycleway:right:oneway: Key:cycleway:right:oneway + cycleway:right:surface: Key:cycleway:right:surface cycleway:right=forward: Key:cycleway:right=forward cycleway:surface: Key:cycleway:surface + cycleway:width: Key:cycleway:width + cycling_width: Key:cycling width date: Key:date date_off: Key:date off date_on: Key:date on @@ -4674,6 +5207,7 @@ en: delivery_point:type: Key:delivery point:type demolished: Key:demolished 'demolished:': 'Key:demolished:' + demolished:building: Key:demolished:building denomination: Key:denomination denotation: Key:denotation departures_board: Key:departures board @@ -4688,17 +5222,35 @@ en: depth:verified: Key:depth:verified descent: Key:descent description: Key:description + description:ar: Key:description:ar description:restrictions: Key:description:restrictions descriptions:restrictions: Key:descriptions:restrictions design: Key:design design:ref: Key:design:ref designation: Key:designation destination: Key:destination + destination:ar: Key:destination:ar + destination:arrow: Key:destination:arrow + destination:arrow:lanes: Key:destination:arrow:lanes destination:backward: Key:destination:backward + destination:colour: Key:destination:colour + destination:colour:backward: Key:destination:colour:backward + destination:colour:forward: Key:destination:colour:forward + destination:colour:lanes: Key:destination:colour:lanes + destination:colour:lanes:backward: Key:destination:colour:lanes:backward + destination:colour:lanes:forward: Key:destination:colour:lanes:forward destination:forward: Key:destination:forward destination:lanes: Key:destination:lanes destination:lanes:backward: Key:destination:lanes:backward destination:lanes:forward: Key:destination:lanes:forward + destination:lang:ar: Key:destination:lang:ar + destination:lang:ar:lanes: Key:destination:lang:ar:lanes + destination:street:ar: Key:destination:street:ar + destination:street:lang:ar: Key:destination:street:lang:ar + destination:street:lang:ar:backward: Key:destination:street:lang:ar:backward + destination:street:lang:ar:forward: Key:destination:street:lang:ar:forward + destination:symbol: Key:destination:symbol + destination:to:lang:ar: Key:destination:to:lang:ar detour: Key:detour devices: Key:devices dewnr:park_id: Key:dewnr:park id @@ -4723,27 +5275,44 @@ en: diplomatic:receiving_country: Key:diplomatic:receiving country diplomatic:sending_country: Key:diplomatic:sending country diplomatic:services: Key:diplomatic:services + diplomatic:services:citizen_services: Key:diplomatic:services:citizen services + diplomatic:services:immigrant_visas: Key:diplomatic:services:immigrant visas + diplomatic:services:non-immigrant_visas: Key:diplomatic:services:non-immigrant + visas direction: Key:direction + direction_east: Key:direction east + direction_north: Key:direction north + direction_northeast: Key:direction northeast + direction_northwest: Key:direction northwest + direction_south: Key:direction south + direction_southeast: Key:direction southeast + direction_southwest: Key:direction southwest + direction_west: Key:direction west dirtbike:scale: Key:dirtbike:scale disabled: Key:disabled disabled_spaces: Key:disabled spaces + disc_golf: Key:disc golf + dishwasher: Key:dishwasher dispensing: Key:dispensing display: Key:display distance: Key:distance distillery: Key:distillery - disused: Key:disused 'disused:': 'Key:disused:' disused:amenity: Key:disused:amenity + disused:building: Key:disused:building + disused:office: Key:disused:office disused:place: Key:disused:place disused:railway: Key:disused:railway disused:shop: Key:disused:shop disused:watermill: Key:disused:watermill + divider: Key:divider dog: Key:dog dominant_taxon: Key:dominant taxon donation:compensation: Key:donation:compensation donation:compensation:payment: Key:donation:compensation:payment donation:compensation:vouchers: Key:donation:compensation:vouchers door: Key:door + double_tracked_motor_vehicle: Key:double tracked motor vehicle draft: Key:draft drink: Key:drink drink:afri-cola: Key:drink:afri-cola @@ -4755,9 +5324,12 @@ en: drink:milk-raw: Key:drink:milk-raw drink:raw_milk: Key:drink:raw milk drink:tea: Key:drink:tea + drink:wine: Key:drink:wine drinkable: Key:drinkable drinking_water: Key:drinking water drinking_water:legal: Key:drinking water:legal + drinking_water:refill: Key:drinking water:refill + drinking_water:refill:network: Key:drinking water:refill:network drive-in: Key:drive-in drive-through: Key:drive-through drive-thru: Key:drive-thru @@ -4767,27 +5339,36 @@ en: driving_side: Key:driving side dryer: Key:dryer drying:room: Key:drying:room + dual_carriageway: Key:dual carriageway duration: Key:duration + duty_free: Key:duty free earthquake: Key:earthquake earthquake:damage: Key:earthquake:damage easy_overtaking: Key:easy overtaking + educational: Key:educational ele: Key:ele ele:NHN: Key:ele:NHN ele:local: Key:ele:local + ele:wgs84: Key:ele:wgs84 + electric_bicycle: Key:electric bicycle electricity: Key:electricity electrified: Key:electrified + elevator: Key:elevator email: Key:email embankment: Key:embankment embassy: Key:embassy embedded_rails: Key:embedded rails embedded_rails:lanes: Key:embedded rails:lanes emergency: Key:emergency + emergency:phone: Key:emergency:phone employee: Key:employee end_date: Key:end date enforcement: Key:enforcement + engineer: Key:engineer entrance: Key:entrance escalator: Key:escalator - esperanto: Key:esperanto + est_height: Key:est height + est_length: Key:est length est_width: Key:est width etymology: Key:etymology european_cultural_path: Key:european cultural path @@ -4799,6 +5380,7 @@ en: expressway: Key:expressway facebook: Key:facebook faces: Key:faces + factory: Key:factory fair_trade: Key:fair trade farming_system: Key:farming system farmyard: Key:farmyard @@ -4807,6 +5389,7 @@ en: fcc:registration_number: Key:fcc:registration number fcc:unique_system_identifier: Key:fcc:unique system identifier fee: Key:fee + fee:conditional: Key:fee:conditional fee:disabled: Key:fee:disabled fee:disabled_assistant: Key:fee:disabled assistant female: Key:female @@ -4820,14 +5403,19 @@ en: fhrs:local_authority_id: Key:fhrs:local authority id field: Key:field finance_agent: Key:finance agent + fire: Key:fire fire_boundary: Key:fire boundary fire_hydrant: Key:fire hydrant fire_object:type: Key:fire object:type fire_operator: Key:fire operator fire_rank: Key:fire rank + firearms: Key:firearms fireplace: Key:fireplace fishing: Key:fishing + fitness_station: Key:fitness station fixme: Key:fixme + flag:name: Key:flag:name + flag:type: Key:flag:type flag:wikidata: Key:flag:wikidata flat_steps: Key:flat steps flickr: Key:flickr @@ -4838,7 +5426,10 @@ en: flow_rate: Key:flow rate food: Key:food foot: Key:foot + foot:backward: Key:foot:backward + foot:forward: Key:foot:forward footway: Key:footway + footway:surface: Key:footway:surface ford: Key:ford forestry: Key:forestry format: Key:format @@ -4850,6 +5441,7 @@ en: frequency: Key:frequency fridge: Key:fridge from: Key:from + from:ar: Key:from:ar fruit: Key:fruit fuel: Key:fuel fuel:1_25: Key:fuel:1 25 @@ -4871,6 +5463,7 @@ en: fuel:e85: Key:fuel:e85 fuel:electricity: Key:fuel:electricity fuel:ethanol: Key:fuel:ethanol + fuel:lng: Key:fuel:lng fuel:lpg: Key:fuel:lpg fuel:methanol: Key:fuel:methanol fuel:octane_100: Key:fuel:octane 100 @@ -4903,14 +5496,19 @@ en: generator:output:vacuum: Key:generator:output:vacuum generator:place: Key:generator:place generator:plant: Key:generator:plant + generator:solar:modules: Key:generator:solar:modules generator:source: Key:generator:source generator:type: Key:generator:type genus: Key:genus + genus:ar: Key:genus:ar genus:de: Key:genus:de + genus:en: Key:genus:en genus:ru: Key:genus:ru geocodigo: Key:geocodigo geological: Key:geological geothermal: Key:geothermal + glacier:part: Key:glacier:part + glacier:type: Key:glacier:type gluten_free: Key:gluten free gnis:fcode: Key:gnis:fcode gnis:feature_id: Key:gnis:feature id @@ -4926,7 +5524,16 @@ en: grassland: Key:grassland gritting: Key:gritting group_only: Key:group only + gtfs:feed: Key:gtfs:feed + gtfs:name: Key:gtfs:name + gtfs:release_date: Key:gtfs:release date + gtfs:route_id: Key:gtfs:route id + gtfs:shape_id: Key:gtfs:shape id + gtfs:stop_id: Key:gtfs:stop id + gtfs:trip_id: Key:gtfs:trip id + gtfs:trip_id:sample: Key:gtfs:trip id:sample guest_house: Key:guest house + guide: Key:guide guidepost: Key:guidepost guidepost:hiking: Key:guidepost:hiking gun_emplacement_type: Key:gun emplacement type @@ -4941,6 +5548,9 @@ en: happy_hours: Key:happy hours harbour: Key:harbour harbour:category: Key:harbour:category + harvest_first_year: Key:harvest first year + hazard: Key:hazard + hazard:animal: Key:hazard:animal hazard_intensity: Key:hazard intensity hazard_occurence: Key:hazard occurence hazard_occurrence: Key:hazard occurrence @@ -4953,17 +5563,22 @@ en: healthcare: Key:healthcare healthcare:counselling: Key:healthcare:counselling healthcare:speciality: Key:healthcare:speciality + heating: Key:heating height: Key:height height:hub: Key:height:hub heritage: Key:heritage heritage:label:FR: Key:heritage:label:FR + heritage:operator: Key:heritage:operator hgv: Key:hgv + hgv:national_network: Key:hgv:national network hgv_articulated: Key:hgv articulated high_water_mark: Key:high water mark highchair: Key:highchair highspeed: Key:highspeed highway: Key:highway highway:category: Key:highway:category + highway:category:pl: Key:highway:category:pl + highway:class:pl: Key:highway:class:pl hiking: Key:hiking historic: Key:historic historic:civilization: Key:historic:civilization @@ -4977,19 +5592,24 @@ en: horse_scale: Key:horse scale hour_off: Key:hour off hour_on: Key:hour on + house: Key:house hov: Key:hov hov:lanes: Key:hov:lanes + hunting: Key:hunting iata: Key:iata icao: Key:icao ice_cream: Key:ice cream ice_cream=yes: Key:ice cream=yes ice_road: Key:ice road ice_skates: Key:ice skates + icn: Key:icn + icn_ref: Key:icn ref ifr: Key:ifr ignore_for_routing: Key:ignore for routing image: Key:image imagery_offset: Key:imagery offset imagery_used: Key:imagery used + import: Key:import import_uuid: Key:import uuid importance: Key:importance impromptu: Key:impromptu @@ -5005,6 +5625,7 @@ en: information: Key:information inline_skates: Key:inline skates inscription: Key:inscription + inscription:ar: Key:inscription:ar inscription:url: Key:inscription:url int_name: Key:int name int_name:ar: Key:int name:ar @@ -5017,6 +5638,7 @@ en: internet_access:operator: Key:internet access:operator internet_access:ssid: Key:internet access:ssid interval: Key:interval + irrigated: Key:irrigated irrigation: Key:irrigation is_hazard_prone: Key:is hazard prone is_in: Key:is in @@ -5040,10 +5662,12 @@ en: it:fvg:ctrn:code: Key:it:fvg:ctrn:code iucn_level: Key:iucn level jel: Key:jel + jetski:rental: Key:jetski:rental jetski:sales: Key:jetski:sales junction: Key:junction junction:ref: Key:junction:ref junction_number: Key:junction number + karaoke: Key:karaoke kct_blue: Key:kct blue kct_green: Key:kct green kct_none: Key:kct none @@ -5052,6 +5676,7 @@ en: kct_yellow: Key:kct yellow kerb: Key:kerb kids_area: Key:kids area + kinky: Key:kinky kms: Key:kms kms:county_name: Key:kms:county name kms:county_no: Key:kms:county no @@ -5074,8 +5699,10 @@ en: lamp_mount: Key:lamp mount lamp_type: Key:lamp type landfill:waste: Key:landfill:waste + landform: Key:landform landmark: Key:landmark landuse: Key:landuse + lane_markings: Key:lane markings lanes: Key:lanes lanes:backward: Key:lanes:backward lanes:both_ways: Key:lanes:both ways @@ -5086,13 +5713,24 @@ en: lanes:psv:forward: Key:lanes:psv:forward language: Key:language language:LL: Key:language:LL + language:ar: Key:language:ar + language:azb: Key:language:azb + language:ckb: Key:language:ckb + language:fa: Key:language:fa + language:glk: Key:language:glk + language:ks: Key:language:ks + language:lrc: Key:language:lrc + language:mzn: Key:language:mzn + language:ps: Key:language:ps + language:sd: Key:language:sd + language:ug: Key:language:ug + language:ur: Key:language:ur lawyer: Key:lawyer layer: Key:layer lcn: Key:lcn lcn_ref: Key:lcn ref leaf_cycle: Key:leaf cycle leaf_type: Key:leaf type - learner_driver: Key:learner driver left: Key:left left:country: Key:left:country leisure: Key:leisure @@ -5104,9 +5742,12 @@ en: lhv: Key:lhv liaison: Key:liaison license_classes: Key:license classes + light_rail: Key:light rail lighting:perceived: Key:lighting:perceived line: Key:line - lines: Key:lines + line_attachement: Key:line attachement + line_attachment: Key:line attachment + line_management: Key:line management listed_status: Key:listed status lit: Key:lit lit:perceived: Key:lit:perceived @@ -5114,7 +5755,10 @@ en: loading_gauge: Key:loading gauge loc_name: Key:loc name loc_name:ar: Key:loc name:ar + loc_name:fa: Key:loc name:fa + loc_name:ur: Key:loc name:ur loc_ref: Key:loc ref + local_authority:FR: Key:local authority:FR local_ref: Key:local ref locale: Key:locale localwiki: Key:localwiki @@ -5123,13 +5767,21 @@ en: lock_name: Key:lock name lock_ref: Key:lock ref lockable: Key:lockable + locked: Key:locked + locked:conditional: Key:locked:conditional + long_name: Key:long name long_name:ar: Key:long name:ar + long_name:azb: Key:long name:azb + long_name:fa: Key:long name:fa + long_name:pnb: Key:long name:pnb + long_name:ur: Key:long name:ur lottery: Key:lottery love_locks: Key:love locks lpn_ref: Key:lpn ref luminous: Key:luminous lunch: Key:lunch lunch:specials: Key:lunch:specials + maaamet:ETAK: Key:maaamet:ETAK maintained: Key:maintained maintenance: Key:maintenance male: Key:male @@ -5141,14 +5793,19 @@ en: manufacturer:type: Key:manufacturer:type manufacturer:wikidata: Key:manufacturer:wikidata mapillary: Key:mapillary + mapper: Key:mapper maritime: Key:maritime + marker: Key:marker massage: Key:massage + massgis:ARTICLE97: Key:massgis:ARTICLE97 + massgis:SITE_NAME: Key:massgis:SITE NAME material: Key:material mattress: Key:mattress max_age: Key:max age maxage: Key:maxage maxaxleload: Key:maxaxleload maxbogieweight: Key:maxbogieweight + maxdraft: Key:maxdraft maxheight: Key:maxheight maxheight:legal: Key:maxheight:legal maxheight:physical: Key:maxheight:physical @@ -5156,17 +5813,24 @@ en: maxspeed: Key:maxspeed maxspeed:advisory: Key:maxspeed:advisory maxspeed:backward: Key:maxspeed:backward + maxspeed:bus: Key:maxspeed:bus maxspeed:conditional: Key:maxspeed:conditional maxspeed:forward: Key:maxspeed:forward maxspeed:hgv: Key:maxspeed:hgv + maxspeed:hgv:backward: Key:maxspeed:hgv:backward + maxspeed:hgv:conditional: Key:maxspeed:hgv:conditional + maxspeed:hgv:forward: Key:maxspeed:hgv:forward maxspeed:lanes: Key:maxspeed:lanes maxspeed:practical: Key:maxspeed:practical maxspeed:seasonal:winter: Key:maxspeed:seasonal:winter maxspeed:source: Key:maxspeed:source + maxspeed:trailer: Key:maxspeed:trailer maxspeed:type: Key:maxspeed:type maxspeed:variable: Key:maxspeed:variable maxstay: Key:maxstay + maxtents: Key:maxtents maxweight: Key:maxweight + maxweight:signed: Key:maxweight:signed maxweightrating: Key:maxweightrating maxweightrating:bus: Key:maxweightrating:bus maxweightrating:hgv: Key:maxweightrating:hgv @@ -5174,6 +5838,7 @@ en: maxwidth:physical: Key:maxwidth:physical mcrb:criteria: Key:mcrb:criteria mdb_id: Key:mdb id + meadow: Key:meadow measurement: Key:measurement medical_supply: Key:medical supply megalith_type: Key:megalith type @@ -5185,15 +5850,21 @@ en: microbrewery: Key:microbrewery milestone_type: Key:milestone type military: Key:military + mimics: Key:mimics min_age: Key:min age min_height: Key:min height minage: Key:minage + mindistance: Key:mindistance mineshaft_type: Key:mineshaft type minibus: Key:minibus minspeed: Key:minspeed minspeed:lanes: Key:minspeed:lanes + mml:class: Key:mml:class + model: Key:model + modifier: Key:modifier mofa: Key:mofa monastery:type: Key:monastery:type + money_transfer: Key:money transfer monitoring:air_quality: Key:monitoring:air quality monitoring:bicycle: Key:monitoring:bicycle monitoring:galileo: Key:monitoring:galileo @@ -5210,6 +5881,7 @@ en: monitoring:traffic: Key:monitoring:traffic monitoring:water_level: Key:monitoring:water level monitoring:weather: Key:monitoring:weather + monorail: Key:monorail monument:genesis: Key:monument:genesis mooring: Key:mooring moped: Key:moped @@ -5226,7 +5898,11 @@ en: motorcycle:repair: Key:motorcycle:repair motorcycle:sales: Key:motorcycle:sales motorcycle:scale: Key:motorcycle:scale + motorcycle:storage: Key:motorcycle:storage motorcycle:theme: Key:motorcycle:theme + motorcycle:tours: Key:motorcycle:tours + motorcycle:training: Key:motorcycle:training + motorcycle:transport: Key:motorcycle:transport motorcycle:type: Key:motorcycle:type motorcycle:tyres: Key:motorcycle:tyres motorhome: Key:motorhome @@ -5246,6 +5922,8 @@ en: name: Key:name name:ar: Key:name:ar name:ar1: Key:name:ar1 + name:ast: Key:name:ast + name:azb: Key:name:azb name:be: Key:name:be name:be-tarask: Key:name:be-tarask name:ber: Key:name:ber @@ -5253,6 +5931,7 @@ en: name:botanical: Key:name:botanical name:br: Key:name:br name:ca: Key:name:ca + name:ckb: Key:name:ckb name:cs: Key:name:cs name:cy: Key:name:cy name:da: Key:name:da @@ -5276,6 +5955,9 @@ en: name:ga: Key:name:ga name:gd: Key:name:gd name:gem: Key:name:gem + name:gl: Key:name:gl + name:glk: Key:name:glk + name:gsw: Key:name:gsw name:he: Key:name:he name:hi: Key:name:hi name:hr: Key:name:hr @@ -5286,20 +5968,27 @@ en: name:it: Key:name:it name:ja: Key:name:ja name:ja-Hira: Key:name:ja-Hira + name:ja_kana: Key:name:ja kana + name:ja_rm: Key:name:ja rm name:jbo: Key:name:jbo name:ka: Key:name:ka name:kab: Key:name:kab + name:kab-Arab: Key:name:kab-Arab name:kk: Key:name:kk + name:kk-Arab: Key:name:kk-Arab name:kn: Key:name:kn name:kn:iso15919: Key:name:kn:iso15919 name:ko: Key:name:ko name:ko-Latn: Key:name:ko-Latn name:ko_rm: Key:name:ko rm + name:ks: Key:name:ks name:ku: Key:name:ku + name:ku-Arab: Key:name:ku-Arab name:left: Key:name:left name:left:ar: Key:name:left:ar name:left:fr: Key:name:left:fr name:lg: Key:name:lg + name:lrc: Key:name:lrc name:lt: Key:name:lt name:lv: Key:name:lv name:mg: Key:name:mg @@ -5307,16 +5996,20 @@ en: name:ml: Key:name:ml name:mr: Key:name:mr name:my: Key:name:my + name:mzn: Key:name:mzn name:nds: Key:name:nds name:nds-nl: Key:name:nds-nl name:nl: Key:name:nl name:nn: Key:name:nn name:no: Key:name:no name:nov: Key:name:nov + name:ota: Key:name:ota name:pl: Key:name:pl + name:pnb: Key:name:pnb name:prefix: Key:name:prefix name:prefix:be: Key:name:prefix:be name:pronunciation: Key:name:pronunciation + name:ps: Key:name:ps name:pt: Key:name:pt name:right: Key:name:right name:right:ar: Key:name:right:ar @@ -5324,6 +6017,8 @@ en: name:ru: Key:name:ru name:ru:word_stress: Key:name:ru:word stress name:sc: Key:name:sc + name:sd: Key:name:sd + name:sh: Key:name:sh name:sk: Key:name:sk name:sl: Key:name:sl name:sr: Key:name:sr @@ -5333,28 +6028,49 @@ en: name:ta: Key:name:ta name:te: Key:name:te name:th: Key:name:th + name:tlh: Key:name:tlh name:tok: Key:name:tok name:tr: Key:name:tr name:tt: Key:name:tt name:tzl: Key:name:tzl + name:ug: Key:name:ug name:uk: Key:name:uk name:ur: Key:name:ur name:vi: Key:name:vi name:vo: Key:name:vo name:wikipedia: Key:name:wikipedia + name:xx: Key:name:xx name:yue: Key:name:yue name:zh: Key:name:zh name:zh-sg: Key:name:zh-sg name_1: Key:name 1 name_2: Key:name 2 + naptan:AltCommonName: Key:naptan:AltCommonName + naptan:AltCrossing: Key:naptan:AltCrossing + naptan:AltIndicator: Key:naptan:AltIndicator + naptan:AltLandmark: Key:naptan:AltLandmark + naptan:AltShortCommonName: Key:naptan:AltShortCommonName + naptan:AltStreet: Key:naptan:AltStreet naptan:AtcoCode: Key:naptan:AtcoCode + naptan:Bearing: Key:naptan:Bearing + naptan:BusStopType: Key:naptan:BusStopType + naptan:CommonName: Key:naptan:CommonName + naptan:Crossing: Key:naptan:Crossing naptan:Indicator: Key:naptan:Indicator + naptan:Landmark: Key:naptan:Landmark naptan:NaptanCode: Key:naptan:NaptanCode + naptan:Notes: Key:naptan:Notes + naptan:PlusbusZoneRef: Key:naptan:PlusbusZoneRef + naptan:ShortCommonName: Key:naptan:ShortCommonName + naptan:StopAreaCode: Key:naptan:StopAreaCode + naptan:StopAreaType: Key:naptan:StopAreaType naptan:Street: Key:naptan:Street + naptan:verified: Key:naptan:verified narrow: Key:narrow nat_name: Key:nat name nat_name:ar: Key:nat name:ar nat_ref: Key:nat ref + nat_ref:ar: Key:nat ref:ar natural: Key:natural naturbase: Key:naturbase naturbase:FORVALTNI: Key:naturbase:FORVALTNI @@ -5373,7 +6089,14 @@ en: ncn_milepost: Key:ncn milepost ncn_ref: Key:ncn ref network: Key:network + network:ar: Key:network:ar + network:guid: Key:network:guid + network:type: Key:network:type network:wikidata: Key:network:wikidata + nhd:com_id: Key:nhd:com id + nhd:fcode: Key:nhd:fcode + nhd:ftype: Key:nhd:ftype + nhd:reach_code: Key:nhd:reach code no-barnehage:nsrid: Key:no-barnehage:nsrid noaddress: Key:noaddress noexit: Key:noexit @@ -5386,8 +6109,10 @@ en: 'not:': 'Key:not:' not:name: Key:not:name not:nccod: Key:not:nccod + not_accepted_import:leisure: Key:not accepted import:leisure not_served_by: Key:not served by note: Key:note + note:ar: Key:note:ar note:deplacer4mE: Key:note:deplacer4mE note:depth: Key:note:depth note:en: Key:note:en @@ -5396,57 +6121,105 @@ en: notes: Key:notes nuclear_explosion:country: Key:nuclear explosion:country nudism: Key:nudism + number_of_apartments: Key:number of apartments nursery: Key:nursery nvdb:date: Key:nvdb:date nvdb:id: Key:nvdb:id + nycdoitt:bin: Key:nycdoitt:bin + object: Key:object + object:city: Key:object:city + object:country: Key:object:country + object:housenumber: Key:object:housenumber + object:postcode: Key:object:postcode + object:street: Key:object:street observatory:type: Key:observatory:type obstacle: Key:obstacle occurrence: Key:occurrence office: Key:office official_name: Key:official name official_name:ar: Key:official name:ar + official_name:azb: Key:official name:azb official_name:be: Key:official name:be + official_name:ckb: Key:official name:ckb + official_name:fa: Key:official name:fa + official_name:glk: Key:official name:glk + official_name:ks: Key:official name:ks + official_name:lrc: Key:official name:lrc + official_name:mzn: Key:official name:mzn + official_name:pnb: Key:official name:pnb + official_name:ps: Key:official name:ps + official_name:sd: Key:official name:sd + official_name:ug: Key:official name:ug + official_name:ur: Key:official name:ur official_ref: Key:official ref offshore: Key:offshore ohv: Key:ohv ois:fixme: Key:ois:fixme + old_addr:housenumber: Key:old addr:housenumber + old_addr:place: Key:old addr:place old_name: Key:old name old_name:ar: Key:old name:ar + old_name:azb: Key:old name:azb old_name:be: Key:old name:be + old_name:ckb: Key:old name:ckb old_name:de: Key:old name:de old_name:en: Key:old name:en old_name:etymology:wikidata: Key:old name:etymology:wikidata + old_name:fa: Key:old name:fa + old_name:ks: Key:old name:ks + old_name:lrc: Key:old name:lrc old_name:pl: Key:old name:pl + old_name:pnb: Key:old name:pnb + old_name:ps: Key:old name:ps old_name:ru: Key:old name:ru + old_name:ug: Key:old name:ug old_name:uk: Key:old name:uk + old_name:ur: Key:old name:ur old_railway_operator: Key:old railway operator old_ref: Key:old ref + old_ref:ar: Key:old ref:ar old_ref:legislative: Key:old ref:legislative old_ref_legislative: Key:old ref legislative old_short_name: Key:old short name oneclass: Key:oneclass oneway: Key:oneway oneway:bicycle: Key:oneway:bicycle + oneway:conditional: Key:oneway:conditional + oneway:foot: Key:oneway:foot oneway:moped: Key:oneway:moped oneway:psv: Key:oneway:psv onkz: Key:onkz + ons_code: Key:ons code + open_air: Key:open air openbenches:id: Key:openbenches:id openfire: Key:openfire opening_date: Key:opening date opening_hours: Key:opening hours + opening_hours/Tutorial: Key:opening hours/Tutorial opening_hours:atm: Key:opening hours:atm + opening_hours:covid19: Key:opening hours:covid19 + opening_hours:drive_through: Key:opening hours:drive through opening_hours:kitchen: Key:opening hours:kitchen + opening_hours:office: Key:opening hours:office + opening_hours:reception: Key:opening hours:reception + opening_hours:signed: Key:opening hours:signed + opening_hours:url: Key:opening hours:url + opening_hours:workshop: Key:opening hours:workshop openplaques:id: Key:openplaques:id - openplaques_plaque: Key:openplaques plaque opensource: Key:opensource + operational_status: Key:operational status operator: Key:operator operator:MNC: Key:operator:MNC + operator:ar: Key:operator:ar operator:be: Key:operator:be operator:en: Key:operator:en + operator:guid: Key:operator:guid operator:ru: Key:operator:ru operator:type: Key:operator:type operator:wikidata: Key:operator:wikidata operator:wikipedia: Key:operator:wikipedia + operator:wikipedia:ar: Key:operator:wikipedia:ar + orchard: Key:orchard organ: Key:organ organic: Key:organic orientation: Key:orientation @@ -5469,7 +6242,9 @@ en: osmarender:renderRef: Key:osmarender:renderRef osmc:status: Key:osmc:status osmc:symbol: Key:osmc:symbol + outdoor: Key:outdoor outdoor_seating: Key:outdoor seating + outdoor_seating:comfort: Key:outdoor seating:comfort oven: Key:oven overtaking: Key:overtaking overtaking:hgv: Key:overtaking:hgv @@ -5492,6 +6267,10 @@ en: parking:lane:left: Key:parking:lane:left parking:lane:right: Key:parking:lane:right parking:lane:side: Key:parking:lane:side + parking:orientation: Key:parking:orientation + parking:street_side: Key:parking:street side + parts: Key:parts + passage_time: Key:passage time passenger: Key:passenger passenger_information_display: Key:passenger information display passenger_lines: Key:passenger lines @@ -5501,22 +6280,40 @@ en: payment: Key:payment payment:account_cards: Key:payment:account cards payment:american_express: Key:payment:american express + payment:cards: Key:payment:cards payment:cash: Key:payment:cash + payment:clipper: Key:payment:clipper payment:coins: Key:payment:coins payment:contactless: Key:payment:contactless payment:credit_cards: Key:payment:credit cards payment:debit_cards: Key:payment:debit cards + payment:discover_card: Key:payment:discover card + payment:e_zpass: Key:payment:e zpass payment:electronic_purses: Key:payment:electronic purses + payment:fastrak: Key:payment:fastrak payment:foo: Key:payment:foo payment:girocard: Key:payment:girocard + payment:good_to_go: Key:payment:good to go + payment:i-pass: Key:payment:i-pass + payment:ipass: Key:payment:ipass + payment:k-tag: Key:payment:k-tag payment:maestro: Key:payment:maestro payment:mastercard: Key:payment:mastercard payment:mir: Key:payment:mir + payment:nc_quick_pass: Key:payment:nc quick pass payment:none: Key:payment:none payment:notes: Key:payment:notes + payment:peach_pass: Key:payment:peach pass + payment:peachpass: Key:payment:peachpass + payment:pikepass: Key:payment:pikepass payment:pro100: Key:payment:pro100 + payment:sunpass: Key:payment:sunpass payment:u-key: Key:payment:u-key payment:visa: Key:payment:visa + payment:visa_debit: Key:payment:visa debit + permanent_camping: Key:permanent camping + pet_allowed: Key:pet allowed + pets_allowed: Key:pets allowed phoenixbikeguide: Key:phoenixbikeguide phone: Key:phone photo: Key:photo @@ -5524,6 +6321,7 @@ en: photography: Key:photography picnic_table: Key:picnic table picture: Key:picture + pihatie: Key:pihatie pilgrimage: Key:pilgrimage pilotage: Key:pilotage pipeline: Key:pipeline @@ -5538,6 +6336,8 @@ en: place:ph: Key:place:ph place_name: Key:place name placement: Key:placement + placement:end: Key:placement:end + placement:start: Key:placement:start planned: Key:planned plant: Key:plant plant:method: Key:plant:method @@ -5553,6 +6353,8 @@ en: plant:output:steam: Key:plant:output:steam plant:output:vacuum: Key:plant:output:vacuum plant:source: Key:plant:source + plant:storage: Key:plant:storage + plant:type: Key:plant:type plant_community: Key:plant community platforms: Key:platforms playground: Key:playground @@ -5561,9 +6363,12 @@ en: point: Key:point pole:type: Key:pole:type police: Key:police + polling_station: Key:polling station population: Key:population population:date: Key:population:date population_rank: Key:population rank + position: Key:position + post_box:design: Key:post box:design post_box:type: Key:post box:type post_office:type: Key:post office:type postal_code: Key:postal code @@ -5584,7 +6389,9 @@ en: priority_road: Key:priority road produce: Key:produce product: Key:product + project:eurosha_2012: Key:project:eurosha 2012 proposed: Key:proposed + proposed:highway: Key:proposed:highway proposed:name: Key:proposed:name protect_class: Key:protect class protect_id: Key:protect id @@ -5593,10 +6400,13 @@ en: prow_ref: Key:prow ref pruning: Key:pruning psv: Key:psv + psv:lanes: Key:psv:lanes public_bookcase:type: Key:public bookcase:type public_transport: Key:public transport public_transport:version: Key:public transport:version pump: Key:pump + pump:status: Key:pump:status + pump_mechanism: Key:pump mechanism pyörä_väistää_aina_autoa: Key:pyörä väistää aina autoa raba:id: Key:raba:id rack: Key:rack @@ -5611,6 +6421,8 @@ en: radio_transponder:range: Key:radio transponder:range radio_transponder:signal_frequency: Key:radio transponder:signal frequency railway: Key:railway + railway:atb: Key:railway:atb + railway:etcs: Key:railway:etcs railway:lzb: Key:railway:lzb railway:position: Key:railway:position railway:preserved: Key:railway:preserved @@ -5620,6 +6432,8 @@ en: railway:signal:speed_limit: Key:railway:signal:speed limit railway:signal:speed_limit_distant: Key:railway:signal:speed limit distant railway:track_ref: Key:railway:track ref + railway:traffic_mode: Key:railway:traffic mode + railway:zbs: Key:railway:zbs ramp: Key:ramp ramp:bicycle: Key:ramp:bicycle ramp:luggage: Key:ramp:luggage @@ -5628,42 +6442,68 @@ en: ramsar: Key:ramsar razed: Key:razed 'razed:': 'Key:razed:' + razed:building: Key:razed:building rcn: Key:rcn rcn_ref: Key:rcn ref real_ale: Key:real ale real_cider: Key:real cider real_fire: Key:real fire recording: Key:recording + recycling:fire_extinguishers: Key:recycling:fire extinguishers recycling_type: Key:recycling type + red_turn:left: Key:red turn:left + red_turn:right: Key:red turn:right + red_turn:right:bicycle: Key:red turn:right:bicycle + red_turn:straight: Key:red turn:straight + red_turn:straight:bicycle: Key:red turn:straight:bicycle + red_turn:straight:left: Key:red turn:straight:left + red_turn:straight:right: Key:red turn:straight:right + rednap:latitud: Key:rednap:latitud reef: Key:reef ref: Key:ref + ref:AGESIC: Key:ref:AGESIC ref:CEF: Key:ref:CEF ref:De_Lijn: Key:ref:De Lijn ref:ERDF:gdo: Key:ref:ERDF:gdo ref:EU:ENTSOE_EIC: Key:ref:EU:ENTSOE EIC + ref:EU:EVSE: Key:ref:EU:EVSE ref:FR:42C: Key:ref:FR:42C + ref:FR:ANFR: Key:ref:FR:ANFR ref:FR:ARCEP: Key:ref:FR:ARCEP + ref:FR:Allocine: Key:ref:FR:Allocine ref:FR:CEF: Key:ref:FR:CEF + ref:FR:CRTA: Key:ref:FR:CRTA + ref:FR:DREAL: Key:ref:FR:DREAL ref:FR:FANTOIR:left: Key:ref:FR:FANTOIR:left ref:FR:FANTOIR:right: Key:ref:FR:FANTOIR:right ref:FR:FINESS: Key:ref:FR:FINESS ref:FR:INSEE: Key:ref:FR:INSEE + ref:FR:IRVE: Key:ref:FR:IRVE ref:FR:LaPoste: Key:ref:FR:LaPoste ref:FR:MemorialGenWeb: Key:ref:FR:MemorialGenWeb ref:FR:NAF: Key:ref:FR:NAF ref:FR:Orange: Key:ref:FR:Orange + ref:FR:Orange_mobile: Key:ref:FR:Orange mobile ref:FR:PTT: Key:ref:FR:PTT + ref:FR:RNA: Key:ref:FR:RNA ref:FR:RTE: Key:ref:FR:RTE ref:FR:RTE_nom: Key:ref:FR:RTE nom + ref:FR:SFR: Key:ref:FR:SFR ref:FR:SIREN: Key:ref:FR:SIREN ref:FR:SIRET: Key:ref:FR:SIRET ref:FR:fantoir: Key:ref:FR:fantoir + ref:FR:gdo: Key:ref:FR:gdo + ref:FR:museofile: Key:ref:FR:museofile ref:FR:prix-carburants: Key:ref:FR:prix-carburants + ref:GB:uprn: Key:ref:GB:uprn ref:HU:edid: Key:ref:HU:edid ref:IFOPT: Key:ref:IFOPT ref:INSEE: Key:ref:INSEE ref:ISTAT: Key:ref:ISTAT + ref:LILA: Key:ref:LILA + ref:LOCODE: Key:ref:LOCODE ref:NAG:UPRN:1: Key:ref:NAG:UPRN:1 + ref:NBd: Key:ref:NBd ref:NLPG:UPRN:1: Key:ref:NLPG:UPRN:1 ref:NPLG:UPRN:1: Key:ref:NPLG:UPRN:1 ref:TECB: Key:ref:TECB @@ -5677,6 +6517,7 @@ en: ref:UrbIS: Key:ref:UrbIS ref:WDPA: Key:ref:WDPA ref:ar: Key:ref:ar + ref:at:bda: Key:ref:at:bda ref:at:gkz: Key:ref:at:gkz ref:at:okz: Key:ref:at:okz ref:bag: Key:ref:bag @@ -5690,10 +6531,19 @@ en: ref:color: Key:ref:color ref:colour: Key:ref:colour ref:coop: Key:ref:coop + ref:crs: Key:ref:crs ref:ctb: Key:ref:ctb + ref:deniirn: Key:ref:deniirn + ref:dhis2: Key:ref:dhis2 ref:edubase: Key:ref:edubase + ref:ef: Key:ref:ef + ref:gnis: Key:ref:gnis + ref:gss: Key:ref:gss ref:gurs:hs_mid: Key:ref:gurs:hs mid + ref:harbour: Key:ref:harbour ref:herbarium: Key:ref:herbarium + ref:hsmaq: Key:ref:hsmaq + ref:industrial: Key:ref:industrial ref:isil: Key:ref:isil ref:kmb: Key:ref:kmb ref:lor: Key:ref:lor @@ -5701,11 +6551,17 @@ en: ref:mhs: Key:ref:mhs ref:miaaddr: Key:ref:miaaddr ref:miabldg: Key:ref:miabldg + ref:minvskaddress: Key:ref:minvskaddress ref:mise: Key:ref:mise ref:mobil-parken.de: Key:ref:mobil-parken.de + ref:nrhp: Key:ref:nrhp ref:ortsnetz: Key:ref:ortsnetz + ref:oslo:tree: Key:ref:oslo:tree ref:penndot: Key:ref:penndot + ref:psma:lga_pid: Key:ref:psma:lga pid + ref:psma:loc_pid: Key:ref:psma:loc pid ref:raa: Key:ref:raa + ref:rce: Key:ref:rce ref:ruian: Key:ref:ruian ref:ruian:addr: Key:ref:ruian:addr ref:ruian:building: Key:ref:ruian:building @@ -5713,14 +6569,20 @@ en: ref:sandre: Key:ref:sandre ref:se:pts:postort: Key:ref:se:pts:postort ref:se:scb: Key:ref:se:scb + ref:seedcode: Key:ref:seedcode ref:shop:num: Key:ref:shop:num ref:sitp: Key:ref:sitp + ref:sr:maticni_broj: Key:ref:sr:maticni broj + ref:statistical: Key:ref:statistical ref:taskey: Key:ref:taskey ref:vatin: Key:ref:vatin ref:vatin:hu: Key:ref:vatin:hu ref:vorwahl: Key:ref:vorwahl ref:wawa: Key:ref:wawa ref:whc: Key:ref:whc + ref:wigos: Key:ref:wigos + ref:wmo: Key:ref:wmo + ref:wpi: Key:ref:wpi ref:zsj: Key:ref:zsj ref_name: Key:ref name reference: Key:reference @@ -5729,15 +6591,24 @@ en: reg_name:ar: Key:reg name:ar reg_ref: Key:reg ref regelbau: Key:regelbau + region:type: Key:region:type + related_law: Key:related law religion: Key:religion removed: Key:removed 'removed:': 'Key:removed:' + removed:amenity: Key:removed:amenity + removed:building: Key:removed:building rental: Key:rental repair: Key:repair repd:id: Key:repd:id repeat_on: Key:repeat on + reporting_mark: Key:reporting mark + reporting_marks: Key:reporting marks + research: Key:research reservation: Key:reservation + reservoir_type: Key:reservoir type residential: Key:residential + resort: Key:resort resource: Key:resource restaurant: Key:restaurant restriction:conditional: Key:restriction:conditional @@ -5758,6 +6629,7 @@ en: roof:colour: Key:roof:colour roof:direction: Key:roof:direction roof:material: Key:roof:material + roof:ridge: Key:roof:ridge roof:shape: Key:roof:shape room: Key:room rooms: Key:rooms @@ -5787,6 +6659,9 @@ en: rv: Key:rv rwn_ref: Key:rwn ref sac_scale: Key:sac scale + safety:hand_sanitizer:covid19: Key:safety:hand sanitizer:covid19 + safety:mask:covid19: Key:safety:mask:covid19 + safety_inspection: Key:safety inspection safety_rope: Key:safety rope safety_rope_side: Key:safety rope side sagns_id: Key:sagns id @@ -5799,6 +6674,8 @@ en: sauna:water:description: Key:sauna:water:description scenic: Key:scenic school: Key:school + scuba_diving:courses: Key:scuba diving:courses + scuba_diving:rental: Key:scuba diving:rental seamark: Key:seamark seamark:beacon_isolated_danger:shape: Key:seamark:beacon isolated danger:shape seamark:beacon_safe_water:colour: Key:seamark:beacon safe water:colour @@ -5878,29 +6755,43 @@ en: self_service: Key:self service sells:tobacco: Key:sells:tobacco service: Key:service + service:bicycle:cleaning: Key:service:bicycle:cleaning service:bicycle:diy: Key:service:bicycle:diy + service:bicycle:pump: Key:service:bicycle:pump service:bicycle:rental: Key:service:bicycle:rental service:bicycle:repair: Key:service:bicycle:repair service:bicycle:retail: Key:service:bicycle:retail service:bicycle:second_hand: Key:service:bicycle:second hand service:vehicle: Key:service:vehicle + service:vehicle:lpg: Key:service:vehicle:lpg service_times: Key:service times shade: Key:shade share_taxi: Key:share taxi shelter: Key:shelter shelter_type: Key:shelter type ship: Key:ship + shoes: Key:shoes shooting: Key:shooting shop: Key:shop short_name: Key:short name short_name:ar: Key:short name:ar + short_name:azb: Key:short name:azb + short_name:ckb: Key:short name:ckb + short_name:fa: Key:short name:fa + short_name:ug: Key:short name:ug + short_name:ur: Key:short name:ur shoulder: Key:shoulder shower: Key:shower side_road: Key:side road sides: Key:sides sidewalk: Key:sidewalk + sidewalk:both:surface: Key:sidewalk:both:surface + sidewalk:left:surface: Key:sidewalk:left:surface + sidewalk:right:surface: Key:sidewalk:right:surface + sidewalk:surface: Key:sidewalk:surface sidewalk_orientation: Key:sidewalk orientation sign: Key:sign + signed_direction: Key:signed direction sinkhole: Key:sinkhole siren:purpose: Key:siren:purpose siren:type: Key:siren:type @@ -5913,7 +6804,6 @@ en: smokefree: Key:smokefree smoking: Key:smoking smoking:outside: Key:smoking:outside - smoking_hours: Key:smoking hours smoothness: Key:smoothness snowmobile: Key:snowmobile snowmobile:sales: Key:snowmobile:sales @@ -5923,34 +6813,63 @@ en: social_facility: Key:social facility social_facility:for: Key:social facility:for socket: Key:socket + socket:schuko: Key:socket:schuko + socket:type1: Key:socket:type1 + socket:type2: Key:socket:type2 + socket:type3c: Key:socket:type3c + socket:typee: Key:socket:typee sorting_name: Key:sorting name sorting_name:ar: Key:sorting name:ar + sorting_name:azb: Key:sorting name:azb sorting_name:be: Key:sorting name:be + sorting_name:fa: Key:sorting name:fa sorting_name:ru: Key:sorting name:ru + sorting_name:ur: Key:sorting name:ur source: Key:source source:ProRail: Key:source:ProRail source:addr: Key:source:addr + source:addr:postcode: Key:source:addr:postcode + source:ar: Key:source:ar + source:area: Key:source:area source:building: Key:source:building + source:conscriptionnumber: Key:source:conscriptionnumber source:date: Key:source:date + source:destination: Key:source:destination source:en: Key:source:en + source:footprint: Key:source:footprint source:geometry: Key:source:geometry source:geometry:date: Key:source:geometry:date + source:geometry:ref: Key:source:geometry:ref + source:imagery: Key:source:imagery source:ja: Key:source:ja + source:lanes: Key:source:lanes source:loc: Key:source:loc source:maxspeed: Key:source:maxspeed source:maxspeed:backward: Key:source:maxspeed:backward source:maxspeed:forward: Key:source:maxspeed:forward source:name: Key:source:name + source:name:ar: Key:source:name:ar + source:name:br: Key:source:name:br + source:name:date: Key:source:name:date + source:oneway: Key:source:oneway + source:outline: Key:source:outline source:population: Key:source:population source:position: Key:source:position source:postcode: Key:source:postcode source:ref: Key:source:ref + source:shape: Key:source:shape + source:taxon: Key:source:taxon + source:tracer: Key:source:tracer + source:zoomlevel: Key:source:zoomlevel source_ref: Key:source ref species: Key:species species:FR: Key:species:FR + species:ar: Key:species:ar species:cs: Key:species:cs species:de: Key:species:de species:en: Key:species:en + species:it: Key:species:it + species:no: Key:species:no species:ru: Key:species:ru species:wikidata: Key:species:wikidata speech_input: Key:speech input @@ -5959,6 +6878,7 @@ en: speech_output:en: Key:speech output:en speech_output:lg: Key:speech output:lg speech_output:pl: Key:speech output:pl + speed_pedelec: Key:speed pedelec speisebezirk: Key:speisebezirk sport: Key:sport sqkm: Key:sqkm @@ -5966,6 +6886,7 @@ en: stamps: Key:stamps stars: Key:stars start_date: Key:start date + state: Key:state station: Key:station status: Key:status step:contrast: Key:step:contrast @@ -5974,6 +6895,7 @@ en: stile: Key:stile stone_type: Key:stone type stop: Key:stop + stop_id: Key:stop id storage_area: Key:storage area stove: Key:stove stranded: Key:stranded @@ -5981,6 +6903,7 @@ en: stream: Key:stream stroller: Key:stroller structure: Key:structure + studio: Key:studio sub_sea: Key:sub sea subject: Key:subject subject:wikidata: Key:subject:wikidata @@ -5989,23 +6912,26 @@ en: subsea: Key:subsea substance: Key:substance substation: Key:substation + subway: Key:subway summit:register: Key:summit:register supervised: Key:supervised support: Key:support support:notinsel: Key:support:notinsel surface: Key:surface + surface:grade: Key:surface:grade surveillance: Key:surveillance surveillance:type: Key:surveillance:type surveillance:zone: Key:surveillance:zone survey:date: Key:survey:date sustrans_ref: Key:sustrans ref + swimming: Key:swimming swimming_pool: Key:swimming pool switch: Key:switch symbol: Key:symbol - table_d_hote: Key:table d hote tactile_map: Key:tactile map tactile_paving: Key:tactile paving tactile_writing: Key:tactile writing + tactile_writing:braille:ar: Key:tactile writing:braille:ar tactile_writing:braille:de: Key:tactile writing:braille:de tactile_writing:braille:lg: Key:tactile writing:braille:lg tactile_writing:computer_braille:lg: Key:tactile writing:computer braille:lg @@ -6015,6 +6941,8 @@ en: letters:de tactile_writing:fakoo: Key:tactile writing:fakoo tactile_writing:moon: Key:tactile writing:moon + tailor:alteration_service: Key:tailor:alteration service + tailor:bespoke_tailoring: Key:tailor:bespoke tailoring takeaway: Key:takeaway tank: Key:tank tank_trap: Key:tank trap @@ -6026,12 +6954,15 @@ en: telecom: Key:telecom telecom:medium: Key:telecom:medium telescope:type: Key:telescope:type + television: Key:television temporary: Key:temporary tenant: Key:tenant tents: Key:tents terrace: Key:terrace teryt: Key:teryt + teryt:rm: Key:teryt:rm teryt:simc: Key:teryt:simc + teryt:stan_na: Key:teryt:stan na teryt:terc: Key:teryt:terc theatre:genre: Key:theatre:genre theatre:type: Key:theatre:type @@ -6049,14 +6980,18 @@ en: tiger:PLACENS: Key:tiger:PLACENS tiger:cfcc: Key:tiger:cfcc tiger:county: Key:tiger:county + tiger:name_direction_prefix: Key:tiger:name direction prefix + tiger:reviewed: Key:tiger:reviewed tiger:separated: Key:tiger:separated tiger:tlid: Key:tiger:tlid tiger:upload_uuid: Key:tiger:upload uuid timezone: Key:timezone to: Key:to + to:ar: Key:to:ar tobacco: Key:tobacco todo: Key:todo toilets: Key:toilets + toilets:paper_supplied: Key:toilets:paper supplied toilets:wheelchair: Key:toilets:wheelchair toll: Key:toll toll:hgv: Key:toll:hgv @@ -6077,9 +7012,11 @@ en: traffic_calming: Key:traffic calming traffic_sign: Key:traffic sign traffic_sign:backward: Key:traffic sign:backward + traffic_sign:direction: Key:traffic sign:direction traffic_sign:forward: Key:traffic sign:forward traffic_signals: Key:traffic signals traffic_signals:arrow: Key:traffic signals:arrow + traffic_signals:countdown: Key:traffic signals:countdown traffic_signals:direction: Key:traffic signals:direction traffic_signals:floor_vibration: Key:traffic signals:floor vibration traffic_signals:minimap: Key:traffic signals:minimap @@ -6092,27 +7029,39 @@ en: trail_visibility: Key:trail visibility trailblazed: Key:trailblazed trailer: Key:trailer + trailer:rental: Key:trailer:rental train: Key:train tram: Key:tram transformer: Key:transformer transformer:devices: Key:transformer:devices + tree_lined: Key:tree lined trees: Key:trees trench: Key:trench trolley_wire: Key:trolley wire trolleybus: Key:trolleybus truck_wash: Key:truck wash + ts_calle: Key:ts calle + ts_codigo: Key:ts codigo + ts_desde: Key:ts desde + ts_hacia: Key:ts hacia + ts_orientacion: Key:ts orientacion tsunami: Key:tsunami tsunami:damage: Key:tsunami:damage tunnel: Key:tunnel tunnel:name: Key:tunnel:name + tunnel:name:ar: Key:tunnel:name:ar turn: Key:turn turn:backward: Key:turn:backward + turn:bicycle:lanes: Key:turn:bicycle:lanes turn:both_ways: Key:turn:both ways + turn:bus:lanes: Key:turn:bus:lanes turn:forward: Key:turn:forward turn:lanes: Key:turn:lanes turn:lanes:backward: Key:turn:lanes:backward turn:lanes:both_ways: Key:turn:lanes:both ways turn:lanes:forward: Key:turn:lanes:forward + turn:psv:lanes: Key:turn:psv:lanes + turn:taxi:lanes: Key:turn:taxi:lanes turn_to_close: Key:turn to close turning_radius: Key:turning radius twitter: Key:twitter @@ -6130,6 +7079,9 @@ en: usage: Key:usage user_defined_other: Key:user defined other utahagrc:parcelid: Key:utahagrc:parcelid + utility: Key:utility + vaccination: Key:vaccination + vacuum_cleaner: Key:vacuum cleaner validate:ants:yellow: Key:validate:ants:yellow validate:no_name: Key:validate:no name validate:no_ref: Key:validate:no ref @@ -6140,14 +7092,18 @@ en: vehicle:conditional: Key:vehicle:conditional vending: Key:vending verge: Key:verge + vhf: Key:vhf + via: Key:via via_ferrata_scale: Key:via ferrata scale view: Key:view viewpoint: Key:viewpoint vine_row_orientation: Key:vine row orientation visibility: Key:visibility + volcano:status: Key:volcano:status voltage: Key:voltage voltage:primary: Key:voltage:primary voltage:secondary: Key:voltage:secondary + walk-in: Key:walk-in wall:material: Key:wall:material washing_machine: Key:washing machine waste: Key:waste @@ -6158,8 +7114,12 @@ en: water_source: Key:water source water_system: Key:water system waterway: Key:waterway - way_area: Key:way area + weather_protection: Key:weather protection website: Key:website + website:booking: Key:website:booking + website:map: Key:website:map + website:menu: Key:website:menu + website:orders: Key:website:orders website:stock: Key:website:stock wetland: Key:wetland wheelchair: Key:wheelchair @@ -6167,28 +7127,44 @@ en: whitewater:rapid_grade: Key:whitewater:rapid grade wholesale: Key:wholesale width: Key:width + width:carriageway: Key:width:carriageway wifi: Key:wifi wiki:symbol: Key:wiki:symbol wikidata: Key:wikidata wikimedia_commons: Key:wikimedia commons wikipedia: Key:wikipedia wikipedia:ar: Key:wikipedia:ar + wikipedia:azb: Key:wikipedia:azb wikipedia:be: Key:wikipedia:be + wikipedia:ckb: Key:wikipedia:ckb wikipedia:de: Key:wikipedia:de wikipedia:en: Key:wikipedia:en + wikipedia:fa: Key:wikipedia:fa wikipedia:fr: Key:wikipedia:fr + wikipedia:glk: Key:wikipedia:glk + wikipedia:ks: Key:wikipedia:ks + wikipedia:lrc: Key:wikipedia:lrc + wikipedia:mzn: Key:wikipedia:mzn wikipedia:pl: Key:wikipedia:pl + wikipedia:pnb: Key:wikipedia:pnb + wikipedia:ps: Key:wikipedia:ps + wikipedia:sd: Key:wikipedia:sd + wikipedia:ug: Key:wikipedia:ug + wikipedia:ur: Key:wikipedia:ur windings: Key:windings windings:configuration: Key:windings:configuration windings:primary: Key:windings:primary windings:secondary: Key:windings:secondary windings:tertiary: Key:windings:tertiary + windmill:type: Key:windmill:type + windmill:vanes: Key:windmill:vanes wine:grape: Key:wine:grape wine:region: Key:wine:region wine:type: Key:wine:type wine:vineyard: Key:wine:vineyard winery: Key:winery winter_road: Key:winter road + winter_room: Key:winter room winter_service: Key:winter service winter_service:gritting: Key:winter service:gritting winter_service:priority: Key:winter service:priority @@ -6196,8 +7172,13 @@ en: wires: Key:wires woeid: Key:woeid wood: Key:wood + wood_available: Key:wood available + wood_provided: Key:wood provided woody_species_100m: Key:woody species 100m workrules: Key:workrules + works: Key:works + workshop: Key:workshop + worship: Key:worship www.prezzibenzina.it: Key:www.prezzibenzina.it xmas:feature: Key:xmas:feature xmpp: Key:xmpp @@ -6207,6 +7188,7 @@ en: yh:STRUCTURE: Key:yh:STRUCTURE yh:TOTYUMONO: Key:yh:TOTYUMONO yh:TYPE: Key:yh:TYPE + yh:WIDTH: Key:yh:WIDTH yh:WIDTH_RANK: Key:yh:WIDTH RANK zero_waste: Key:zero waste zone: Key:zone @@ -6220,17 +7202,25 @@ en: abandoned:amenity=prison: Tag:abandoned:amenity=prison abandoned:amenity=prison_camp: Tag:abandoned:amenity=prison camp abandoned=yes: Tag:abandoned=yes + access=agricultural: Tag:access=agricultural access=customers: Tag:access=customers + access=delivery: Tag:access=delivery access=designated: Tag:access=designated access=exclusion_zone: Tag:access=exclusion zone + access=forestry: Tag:access=forestry access=license: Tag:access=license access=no: Tag:access=no access=official: Tag:access=official + access=permissive: Tag:access=permissive + access=permit: Tag:access=permit access=private: Tag:access=private + access=public: Tag:access=public access=restricted: Tag:access=restricted access=use_sidepath: Tag:access=use sidepath actuator=electric_motor: Tag:actuator=electric motor actuator=hydraulic_cylinder: Tag:actuator=hydraulic cylinder + actuator=manual: Tag:actuator=manual + actuator=pneumatic_cylinder: Tag:actuator=pneumatic cylinder admin_level=1: Tag:admin level=1 admin_level=10: Tag:admin level=10 admin_level=11: Tag:admin level=11 @@ -6281,6 +7271,7 @@ en: aeroway=airport: Tag:aeroway=airport aeroway=airstrip: Tag:aeroway=airstrip aeroway=apron: Tag:aeroway=apron + aeroway=arresting_gear: Tag:aeroway=arresting gear aeroway=fuel: Tag:aeroway=fuel aeroway=gate: Tag:aeroway=gate aeroway=hangar: Tag:aeroway=hangar @@ -6322,6 +7313,7 @@ en: amenity=bar: Tag:amenity=bar amenity=bbq: Tag:amenity=bbq amenity=bench: Tag:amenity=bench + amenity=bicycle_library: Tag:amenity=bicycle library amenity=bicycle_parking: Tag:amenity=bicycle parking amenity=bicycle_rental: Tag:amenity=bicycle rental amenity=bicycle_repair_station: Tag:amenity=bicycle repair station @@ -6329,7 +7321,9 @@ en: amenity=biergarten: Tag:amenity=biergarten amenity=bike_parking: Tag:amenity=bike parking amenity=bikeshed: Tag:amenity=bikeshed + amenity=binoculars: Tag:amenity=binoculars amenity=bird_bath: Tag:amenity=bird bath + amenity=blood_bank: Tag:amenity=blood bank amenity=boat_rental: Tag:amenity=boat rental amenity=boat_sharing: Tag:amenity=boat sharing amenity=boat_storage: Tag:amenity=boat storage @@ -6339,11 +7333,13 @@ en: amenity=bus_station: Tag:amenity=bus station amenity=bus_stop: Tag:amenity=bus stop amenity=cafe: Tag:amenity=cafe + amenity=canteen: Tag:amenity=canteen amenity=car_pooling: Tag:amenity=car pooling amenity=car_rental: Tag:amenity=car rental amenity=car_repair: Tag:amenity=car repair amenity=car_sharing: Tag:amenity=car sharing amenity=car_wash: Tag:amenity=car wash + amenity=carpet_washing: Tag:amenity=carpet washing amenity=carwash: Tag:amenity=carwash amenity=casino: Tag:amenity=casino amenity=charging_station: Tag:amenity=charging station @@ -6353,6 +7349,7 @@ en: amenity=clinic: Tag:amenity=clinic amenity=cloakroom: Tag:amenity=cloakroom amenity=clock: Tag:amenity=clock + amenity=clothes_dryer: Tag:amenity=clothes dryer amenity=club: Tag:amenity=club amenity=coast_guard: Tag:amenity=coast guard amenity=coast_radar_station: Tag:amenity=coast radar station @@ -6363,6 +7360,7 @@ en: amenity=concert_hall: Tag:amenity=concert hall amenity=concession_stand: Tag:amenity=concession stand amenity=conference_centre: Tag:amenity=conference centre + amenity=consulate: Tag:amenity=consulate amenity=courthouse: Tag:amenity=courthouse amenity=coworking_space: Tag:amenity=coworking space amenity=crematorium: Tag:amenity=crematorium @@ -6410,19 +7408,24 @@ en: amenity=fountain: Tag:amenity=fountain amenity=fridge: Tag:amenity=fridge amenity=fuel: Tag:amenity=fuel + amenity=funeral_hall: Tag:amenity=funeral hall amenity=gambling: Tag:amenity=gambling amenity=game_feeding: Tag:amenity=game feeding amenity=garages: Tag:amenity=garages + amenity=give_box: Tag:amenity=give box amenity=grave_yard: Tag:amenity=grave yard amenity=grit_bin: Tag:amenity=grit bin amenity=gym: Tag:amenity=gym amenity=gym_(Don't_use): Tag:amenity=gym (Don't use) amenity=harbourmaster: Tag:amenity=harbourmaster + amenity=health_post: Tag:amenity=health post + amenity=hitching_post: Tag:amenity=hitching post amenity=hookah_lounge: Tag:amenity=hookah lounge amenity=hospice: Tag:amenity=hospice amenity=hospital: Tag:amenity=hospital amenity=hotel: Tag:amenity=hotel amenity=hunting_stand: Tag:amenity=hunting stand + amenity=hydrant: Tag:amenity=hydrant amenity=ice_cream: Tag:amenity=ice cream amenity=internet_cafe: Tag:amenity=internet cafe amenity=jobcentre: Tag:amenity=jobcentre @@ -6439,23 +7442,29 @@ en: amenity=life_ring: Tag:amenity=life ring amenity=lifeboat_station: Tag:amenity=lifeboat station amenity=loading_dock: Tag:amenity=loading dock + amenity=lost_property_office: Tag:amenity=lost property office amenity=lounger: Tag:amenity=lounger amenity=love_hotel: Tag:amenity=love hotel amenity=marae: Tag:amenity=marae amenity=marketplace: Tag:amenity=marketplace amenity=microwave: Tag:amenity=microwave amenity=milk_dispenser: Tag:amenity=milk dispenser + amenity=mist_spraying_cooler: Tag:amenity=mist spraying cooler amenity=mobile_library: Tag:amenity=mobile library + amenity=mobile_money_agent: Tag:amenity=mobile money agent amenity=monastery: Tag:amenity=monastery amenity=money_transfer: Tag:amenity=money transfer amenity=mortuary: Tag:amenity=mortuary amenity=motorcycle_parking: Tag:amenity=motorcycle parking amenity=motorcycle_rental: Tag:amenity=motorcycle rental + amenity=motorcycle_taxi: Tag:amenity=motorcycle taxi amenity=music_school: Tag:amenity=music school amenity=music_venue: Tag:amenity=music venue amenity=nightclub: Tag:amenity=nightclub amenity=nursery: Tag:amenity=nursery amenity=nursing_home: Tag:amenity=nursing home + amenity=office: Tag:amenity=office + amenity=outfitter: Tag:amenity=outfitter amenity=park: Tag:amenity=park amenity=parking: Tag:amenity=parking amenity=parking_entrance: Tag:amenity=parking entrance @@ -6465,6 +7474,7 @@ en: amenity=payment_terminal: Tag:amenity=payment terminal amenity=pharmacy: Tag:amenity=pharmacy amenity=photo_booth: Tag:amenity=photo booth + amenity=piano: Tag:amenity=piano amenity=place_of_worship: Tag:amenity=place of worship amenity=planetarium: Tag:amenity=planetarium amenity=police: Tag:amenity=police @@ -6486,12 +7496,14 @@ en: amenity=reception_desk: Tag:amenity=reception desk amenity=recycling: Tag:amenity=recycling amenity=refugee_housing: Tag:amenity=refugee housing + amenity=refugee_site: Tag:amenity=refugee site amenity=register_office: Tag:amenity=register office amenity=rescue_box: Tag:amenity=rescue box amenity=rescue_station: Tag:amenity=rescue station amenity=research_institute: Tag:amenity=research institute amenity=restaurant: Tag:amenity=restaurant amenity=retirement_home: Tag:amenity=retirement home + amenity=rv_storage: Tag:amenity=rv storage amenity=sailing_school: Tag:amenity=sailing school amenity=sanatorium: Tag:amenity=sanatorium amenity=sanitary_dump_station: Tag:amenity=sanitary dump station @@ -6508,9 +7520,12 @@ en: amenity=smoking_area: Tag:amenity=smoking area amenity=snow_removal_station: Tag:amenity=snow removal station amenity=social_centre: Tag:amenity=social centre + amenity=social_club: Tag:amenity=social club amenity=social_facility: Tag:amenity=social facility amenity=spa: Tag:amenity=spa + amenity=sport_school: Tag:amenity=sport school amenity=stables: Tag:amenity=stables + amenity=stage: Tag:amenity=stage amenity=stool: Tag:amenity=stool amenity=street_lamp: Tag:amenity=street lamp amenity=street_light: Tag:amenity=street light @@ -6530,6 +7545,8 @@ en: amenity=toilets: Tag:amenity=toilets amenity=tourist_bus_parking: Tag:amenity=tourist bus parking amenity=townhall: Tag:amenity=townhall + amenity=toy_library: Tag:amenity=toy library + amenity=trailer_park: Tag:amenity=trailer park amenity=trolley_bay: Tag:amenity=trolley bay amenity=tuition: Tag:amenity=tuition amenity=university: Tag:amenity=university @@ -6555,6 +7572,7 @@ en: animal=horse_walker: Tag:animal=horse walker animal=school: Tag:animal=school animal_breeding=gamecock: Tag:animal breeding=gamecock + animal_shelter:sanctuary=yes: Tag:animal shelter:sanctuary=yes animated=trivision_blades: Tag:animated=trivision blades animated=winding_posters: Tag:animated=winding posters anthropogenic=yes: Tag:anthropogenic=yes @@ -6562,8 +7580,14 @@ en: area:highway=footway: Tag:area:highway=footway area:highway=path: Tag:area:highway=path area:highway=pedestrian: Tag:area:highway=pedestrian + area:highway=turning_circle: Tag:area:highway=turning circle + artwork_type=architecture: Tag:artwork type=architecture + artwork_type=bust: Tag:artwork type=bust + artwork_type=mural: Tag:artwork type=mural + artwork_type=relief: Tag:artwork type=relief artwork_type=sculpture: Tag:artwork type=sculpture artwork_type=statue: Tag:artwork type=statue + artwork_type=stone: Tag:artwork type=stone assembly_point:earthquake=yes: Tag:assembly point:earthquake=yes assembly_point:fire=yes: Tag:assembly point:fire=yes assembly_point:flood=yes: Tag:assembly point:flood=yes @@ -6572,6 +7596,7 @@ en: assembly_point:tsunami=yes: Tag:assembly point:tsunami=yes atm=no: Tag:atm=no atm=yes: Tag:atm=yes + attraction=alpine_coaster: Tag:attraction=alpine coaster attraction=animal: Tag:attraction=animal attraction=maze: Tag:attraction=maze attraction=roller_coaster: Tag:attraction=roller coaster @@ -6581,8 +7606,11 @@ en: baby_hatch=yes: Tag:baby hatch=yes bakehouse: Tag:bakehouse baking_oven: Tag:baking oven + barrier=bar: Tag:barrier=bar + barrier=berm: Tag:barrier=berm barrier=block: Tag:barrier=block barrier=bollard: Tag:barrier=bollard + barrier=boom: Tag:barrier=boom barrier=border_control: Tag:barrier=border control barrier=bump_gate: Tag:barrier=bump gate barrier=bus_trap: Tag:barrier=bus trap @@ -6602,6 +7630,7 @@ en: barrier=full-height_turnstile: Tag:barrier=full-height turnstile barrier=gate: Tag:barrier=gate barrier=guard_rail: Tag:barrier=guard rail + barrier=haha: Tag:barrier=haha barrier=hampshire_gate: Tag:barrier=hampshire gate barrier=handrail: Tag:barrier=handrail barrier=hedge: Tag:barrier=hedge @@ -6617,13 +7646,13 @@ en: barrier=lift_gate: Tag:barrier=lift gate barrier=log: Tag:barrier=log barrier=motorcycle_barrier: Tag:barrier=motorcycle barrier - barrier=ohm:military:wireObstacle: Tag:barrier=ohm:military:wireObstacle - barrier=ohm:ww1:wireObstacle: Tag:barrier=ohm:ww1:wireObstacle barrier=retaining_wall: Tag:barrier=retaining wall barrier=rope: Tag:barrier=rope barrier=sally_port: Tag:barrier=sally port barrier=select_acces: Tag:barrier=select acces + barrier=sliding_gate: Tag:barrier=sliding gate barrier=spikes: Tag:barrier=spikes + barrier=step: Tag:barrier=step barrier=stile: Tag:barrier=stile barrier=sump_buster: Tag:barrier=sump buster barrier=swing_gate: Tag:barrier=swing gate @@ -6631,19 +7660,37 @@ en: barrier=toll_booth: Tag:barrier=toll booth barrier=tree: Tag:barrier=tree barrier=turnstile: Tag:barrier=turnstile + barrier=tyres: Tag:barrier=tyres barrier=wall: Tag:barrier=wall + barrier=wicket_gate: Tag:barrier=wicket gate + barrier=yes: Tag:barrier=yes baseball=softball: Tag:baseball=softball + basin=cooling: Tag:basin=cooling + basin=detention: Tag:basin=detention + basin=infiltration: Tag:basin=infiltration + basin=retention: Tag:basin=retention bath:type=hammam: Tag:bath:type=hammam bath:type=hot_spring: Tag:bath:type=hot spring bath:type=onsen: Tag:bath:type=onsen bath:type=thermal: Tag:bath:type=thermal bay=fjord: Tag:bay=fjord bbq=yes: Tag:bbq=yes + beacon:type=DVOR: Tag:beacon:type=DVOR + beacon:type=ILS: Tag:beacon:type=ILS + beacon:type=NDB: Tag:beacon:type=NDB + beacon:type=TACAN: Tag:beacon:type=TACAN + beacon:type=VOR: Tag:beacon:type=VOR + bicycle:backward=use_sidepath: Tag:bicycle:backward=use sidepath + bicycle:forward=use_sidepath: Tag:bicycle:forward=use sidepath bicycle=designated: Tag:bicycle=designated + bicycle=dismount: Tag:bicycle=dismount + bicycle=no: Tag:bicycle=no bicycle=official: Tag:bicycle=official bicycle=use_sidepath: Tag:bicycle=use sidepath + bicycle=yes: Tag:bicycle=yes biosphärenwirt=yes: Tag:biosphärenwirt=yes birds_nest=stork: Tag:birds nest=stork + board_type=board: Tag:board type=board boat:rental=yes: Tag:boat:rental=yes boat:type=canoe: Tag:boat:type=canoe boat:type=dinghy: Tag:boat:type=dinghy @@ -6652,14 +7699,16 @@ en: boat:type=pedalo: Tag:boat:type=pedalo boat:type=rowing: Tag:boat:type=rowing boat:type=sailing: Tag:boat:type=sailing - border_type=IALA: Tag:border type=IALA border_type=fishery: Tag:border type=fishery border_type=harbour_limits: Tag:border type=harbour limits boundary=aboriginal_lands: Tag:boundary=aboriginal lands boundary=administrative: Tag:boundary=administrative + boundary=census: Tag:boundary=census boundary=civil: Tag:boundary=civil boundary=economic: Tag:boundary=economic boundary=forest_compartment: Tag:boundary=forest compartment + boundary=forestry_compartment: Tag:boundary=forestry compartment + boundary=hazard: Tag:boundary=hazard boundary=historic: Tag:boundary=historic boundary=local_authority: Tag:boundary=local authority boundary=low_emission_zone: Tag:boundary=low emission zone @@ -6668,17 +7717,23 @@ en: boundary=military_district: Tag:boundary=military district boundary=national: Tag:boundary=national boundary=national_park: Tag:boundary=national park + boundary=place: Tag:boundary=place boundary=political: Tag:boundary=political boundary=postal_code: Tag:boundary=postal code boundary=protected_area: Tag:boundary=protected area boundary=regional_park: Tag:boundary=regional park + boundary=safety_region: Tag:boundary=safety region + boundary=special_economic_zone: Tag:boundary=special economic zone boundary=timezone: Tag:boundary=timezone boundary=urban: Tag:boundary=urban boundary=vice_county: Tag:boundary=vice county + boundary=waste_collection: Tag:boundary=waste collection boundary=water_protection_area: Tag:boundary=water protection area brand=Harley-Davidson: Tag:brand=Harley-Davidson brand=KTM: Tag:brand=KTM + brand=Louis_Motorrad: Tag:brand=Louis Motorrad brand=Moto_Guzzi: Tag:brand=Moto Guzzi + brand=Polo_Motorrad: Tag:brand=Polo Motorrad brand=Triumph: Tag:brand=Triumph brand=Zero: Tag:brand=Zero bridge:movable=bascule: Tag:bridge:movable=bascule @@ -6707,10 +7762,14 @@ en: bridge=trestle: Tag:bridge=trestle bridge=viaduct: Tag:bridge=viaduct building:use=stable: Tag:building:use=stable + building=*: Tag:building=* + building=Y: Tag:building=Y + building=abandoned: Tag:building=abandoned building=allotment_house: Tag:building=allotment house building=apartments: Tag:building=apartments building=bakehouse: Tag:building=bakehouse building=barn: Tag:building=barn + building=barracks: Tag:building=barracks building=boathouse: Tag:building=boathouse building=brewery: Tag:building=brewery building=bridge: Tag:building=bridge @@ -6718,28 +7777,40 @@ en: building=bunker: Tag:building=bunker building=cabin: Tag:building=cabin building=carport: Tag:building=carport + building=castle: Tag:building=castle building=cathedral: Tag:building=cathedral building=central_office: Tag:building=central office building=chapel: Tag:building=chapel building=church: Tag:building=church building=civic: Tag:building=civic + building=collapsed: Tag:building=collapsed building=college: Tag:building=college building=commercial: Tag:building=commercial building=condominium: Tag:building=condominium building=conservatory: Tag:building=conservatory + building=constructie: Tag:building=constructie building=construction: Tag:building=construction building=container: Tag:building=container + building=convent: Tag:building=convent building=cowshed: Tag:building=cowshed building=detached: Tag:building=detached + building=digester: Tag:building=digester + building=disused: Tag:building=disused building=dormitory: Tag:building=dormitory building=entrance: Tag:building=entrance building=exit: Tag:building=exit + building=factory: Tag:building=factory building=farm: Tag:building=farm building=farm_auxiliary: Tag:building=farm auxiliary + building=fire_station: Tag:building=fire station building=font: Tag:building=font + building=fort: Tag:building=fort + building=funeral_hall: Tag:building=funeral hall building=garage: Tag:building=garage building=garages: Tag:building=garages + building=gatehouse: Tag:building=gatehouse building=ger: Tag:building=ger + building=glasshouse: Tag:building=glasshouse building=government: Tag:building=government building=grandstand: Tag:building=grandstand building=greenhouse: Tag:building=greenhouse @@ -6755,10 +7826,15 @@ en: building=kiosk: Tag:building=kiosk building=manufacture: Tag:building=manufacture building=marquee: Tag:building=marquee + building=military: Tag:building=military + building=monastery: Tag:building=monastery building=mosque: Tag:building=mosque + building=museum: Tag:building=museum building=office: Tag:building=office + building=palace: Tag:building=palace building=parking: Tag:building=parking building=pavilion: Tag:building=pavilion + building=proposed: Tag:building=proposed building=public: Tag:building=public building=religious: Tag:building=religious building=remote_digital_terminal: Tag:building=remote digital terminal @@ -6766,12 +7842,14 @@ en: building=retail: Tag:building=retail building=riding_hall: Tag:building=riding hall building=roof: Tag:building=roof + building=roundhouse: Tag:building=roundhouse building=ruins: Tag:building=ruins building=school: Tag:building=school building=semi: Tag:building=semi building=semidetached_house: Tag:building=semidetached house building=service: Tag:building=service building=shed: Tag:building=shed + building=ship: Tag:building=ship building=shrine: Tag:building=shrine building=slurry_tank: Tag:building=slurry tank building=sports_centre: Tag:building=sports centre @@ -6780,6 +7858,7 @@ en: building=stadium: Tag:building=stadium building=static_caravan: Tag:building=static caravan building=stilt_house: Tag:building=stilt house + building=storage_tank: Tag:building=storage tank building=sty: Tag:building=sty building=supermarket: Tag:building=supermarket building=synagogue: Tag:building=synagogue @@ -6791,16 +7870,25 @@ en: building=train_station: Tag:building=train station building=transformer_tower: Tag:building=transformer tower building=transportation: Tag:building=transportation + building=tree_house: Tag:building=tree house + building=true: Tag:building=true building=trullo: Tag:building=trullo + building=unclassified: Tag:building=unclassified + building=undefined: Tag:building=undefined + building=unidentified: Tag:building=unidentified building=university: Tag:building=university + building=unknown: Tag:building=unknown building=warehouse: Tag:building=warehouse building=water_tower: Tag:building=water tower building=yes: Tag:building=yes bunker_type=gun_emplacement: Tag:bunker type=gun emplacement bunker_type=hardened_aircraft_shelter: Tag:bunker type=hardened aircraft shelter bunker_type=munitions: Tag:bunker type=munitions + bunker_type=personnel_shelter: Tag:bunker type=personnel shelter bunker_type=pillbox: Tag:bunker type=pillbox bunker_type=technical: Tag:bunker type=technical + bus=minibus: Tag:bus=minibus + bus=no: Tag:bus=no bus=yes: Tag:bus=yes busbar=flexible: Tag:busbar=flexible busbar=rigid: Tag:busbar=rigid @@ -6808,7 +7896,10 @@ en: busway:right=lane: Tag:busway:right=lane busway=lane: Tag:busway=lane busway=opposite_lane: Tag:busway=opposite lane + by_night=only: Tag:by night=only + cabin:rental=yes: Tag:cabin:rental=yes cafe=time-cafe: Tag:cafe=time-cafe + cafe=time_cafe: Tag:cafe=time cafe camp_site=basic: Tag:camp site=basic camp_site=camp_pitch: Tag:camp site=camp pitch camp_site=deluxe: Tag:camp site=deluxe @@ -6820,7 +7911,9 @@ en: capital=6: Tag:capital=6 capital=yes: Tag:capital=yes car:type=hgv: Tag:car:type=hgv - cargo=container: Tag:cargo=container + car=no: Tag:car=no + car=yes: Tag:car=yes + carpenter=joiner: Tag:carpenter=joiner castle_type=castrum: Tag:castle type=castrum castle_type=defensive: Tag:castle type=defensive castle_type=fortress: Tag:castle type=fortress @@ -6830,6 +7923,7 @@ en: castle_type=shiro: Tag:castle type=shiro castle_type=stately: Tag:castle type=stately cemetery=grave: Tag:cemetery=grave + cemetery=sector: Tag:cemetery=sector cemetery=war_cemetery: Tag:cemetery=war cemetery clothes=fashion: Tag:clothes=fashion clothes=motorcycle: Tag:clothes=motorcycle @@ -6843,18 +7937,23 @@ en: club=fan: Tag:club=fan club=motorcycle: Tag:club=motorcycle club=scout: Tag:club=scout + club=scuba_diving: Tag:club=scuba diving club=sport: Tag:club=sport coastline:survey_quality=complete: Tag:coastline:survey quality=complete coastline:survey_quality=inadequate: Tag:coastline:survey quality=inadequate collection_times:signed=no: Tag:collection times:signed=no communication=line: Tag:communication=line + communication=mobile_phone: Tag:communication=mobile phone + company=aerospace: Tag:company=aerospace construction=yes: Tag:construction=yes consulate=consular_agency: Tag:consulate=consular agency consulate=consular_office: Tag:consulate=consular office consulate=consulate_general: Tag:consulate=consulate general consulate=honorary_consul: Tag:consulate=honorary consul consulate=yes: Tag:consulate=yes + content=hot_water: Tag:content=hot water craft=agricultural_engines: Tag:craft=agricultural engines + craft=atelier: Tag:craft=atelier craft=bag_repair: Tag:craft=bag repair craft=bakery: Tag:craft=bakery craft=basket_maker: Tag:craft=basket maker @@ -6865,16 +7964,20 @@ en: craft=brewery: Tag:craft=brewery craft=builder: Tag:craft=builder craft=cabinet_maker: Tag:craft=cabinet maker + craft=car_painter: Tag:craft=car painter craft=car_repair: Tag:craft=car repair craft=carpenter: Tag:craft=carpenter + craft=carpet_cleaner: Tag:craft=carpet cleaner craft=carpet_layer: Tag:craft=carpet layer craft=caterer: Tag:craft=caterer + craft=cheese: Tag:craft=cheese craft=chimney_sweeper: Tag:craft=chimney sweeper craft=clockmaker: Tag:craft=clockmaker craft=confectionery: Tag:craft=confectionery craft=cooper: Tag:craft=cooper craft=dental_technician: Tag:craft=dental technician craft=distillery: Tag:craft=distillery + craft=door_construction: Tag:craft=door construction craft=dressmaker: Tag:craft=dressmaker craft=electrican: Tag:craft=electrican craft=electrician: Tag:craft=electrician @@ -6883,6 +7986,7 @@ en: craft=engraver: Tag:craft=engraver craft=floorer: Tag:craft=floorer craft=gardener: Tag:craft=gardener + craft=glassblower: Tag:craft=glassblower craft=glaziery: Tag:craft=glaziery craft=goldsmith: Tag:craft=goldsmith craft=grinding_mill: Tag:craft=grinding mill @@ -6937,6 +8041,7 @@ en: craft=turner: Tag:craft=turner craft=upholsterer: Tag:craft=upholsterer craft=watchmaker: Tag:craft=watchmaker + craft=water_well_drilling: Tag:craft=water well drilling craft=welder: Tag:craft=welder craft=window_construction: Tag:craft=window construction craft=winery: Tag:craft=winery @@ -6952,6 +8057,7 @@ en: crop=cereal: Tag:crop=cereal crop=coffee: Tag:crop=coffee crop=corn: Tag:crop=corn + crop=fast_growing_wood: Tag:crop=fast growing wood crop=flowers: Tag:crop=flowers crop=grape: Tag:crop=grape crop=grass: Tag:crop=grass @@ -6962,20 +8068,36 @@ en: crop=rape: Tag:crop=rape crop=rice: Tag:crop=rice crop=rye: Tag:crop=rye + crop=short_rotation_forestry: Tag:crop=short rotation forestry crop=soy: Tag:crop=soy crop=strawberry: Tag:crop=strawberry crop=sugar: Tag:crop=sugar + crop=sugarcane: Tag:crop=sugarcane crop=sunflower: Tag:crop=sunflower crop=tea: Tag:crop=tea crop=wheat: Tag:crop=wheat + crossing=marked: Tag:crossing=marked + crossing=no: Tag:crossing=no + crossing=traffic_signals: Tag:crossing=traffic signals + crossing=uncontrolled: Tag:crossing=uncontrolled crossing=unknown: Tag:crossing=unknown + crossing=unmarked: Tag:crossing=unmarked crossing=zebra: Tag:crossing=zebra + cuisine=barbecue: Tag:cuisine=barbecue cuisine=brazilian: Tag:cuisine=brazilian cuisine=brunch: Tag:cuisine=brunch cuisine=bubble_tea: Tag:cuisine=bubble tea cuisine=coffee_shop: Tag:cuisine=coffee shop cuisine=dessert: Tag:cuisine=dessert + cuisine=empanada: Tag:cuisine=empanada + cuisine=fish_and_chips: Tag:cuisine=fish and chips + cuisine=friture: Tag:cuisine=friture cuisine=tea_shop: Tag:cuisine=tea shop + curve=hairpin: Tag:curve=hairpin + curve=loop: Tag:curve=loop + curves=extended: Tag:curves=extended + curves=serpentine: Tag:curves=serpentine + cycle_network=EuroVelo: Tag:cycle network=EuroVelo cycle_network=US:CA:SF: Tag:cycle network=US:CA:SF cycle_network=US:GA: Tag:cycle network=US:GA cycle_network=US:LA:NO: Tag:cycle network=US:LA:NO @@ -6985,6 +8107,8 @@ en: cycle_network=US:OH: Tag:cycle network=US:OH cycle_network=US:PA: Tag:cycle network=US:PA cycle_network=US:US: Tag:cycle network=US:US + cycle_network=cycle_highway: Tag:cycle network=cycle highway + cycleway:both=lane: Tag:cycleway:both=lane cycleway:left=lane: Tag:cycleway:left=lane cycleway:left=opposite_lane: Tag:cycleway:left=opposite lane cycleway:left=opposite_track: Tag:cycleway:left=opposite track @@ -7006,6 +8130,7 @@ en: cycleway=shared_busway: Tag:cycleway=shared busway cycleway=sidepath: Tag:cycleway=sidepath cycleway=track: Tag:cycleway=track + dataset=buildings: Tag:dataset=buildings defensive=bergfried: Tag:defensive=bergfried defensive=donjon: Tag:defensive=donjon defensive=keep: Tag:defensive=keep @@ -7026,9 +8151,17 @@ en: diplomatic=honorary_consulate: Tag:diplomatic=honorary consulate diplomatic=liaison: Tag:diplomatic=liaison diplomatic=permanent_mission: Tag:diplomatic=permanent mission + disc_golf=basket: Tag:disc golf=basket + disc_golf=hole: Tag:disc golf=hole + disc_golf=tee: Tag:disc golf=tee + disused=yes: Tag:disused=yes dock=drydock: Tag:dock=drydock dock=floating: Tag:dock=floating dock=tidal: Tag:dock=tidal + driveway=pipestem: Tag:driveway=pipestem + dual_carriageway=no: Tag:dual carriageway=no + dual_carriageway=yes: Tag:dual carriageway=yes + electrified=4th_rail: Tag:electrified=4th rail electrified=contact_line: Tag:electrified=contact line electrified=rail: Tag:electrified=rail embassy=branch_embassy: Tag:embassy=branch embassy @@ -7039,6 +8172,9 @@ en: embassy=nunciature: Tag:embassy=nunciature embassy=residence: Tag:embassy=residence embassy=yes: Tag:embassy=yes + emergency:social_facility:for=displaced_people: Tag:emergency:social facility:for=displaced + people + emergency:social_facility=shelter: Tag:emergency:social facility=shelter emergency=access_point: Tag:emergency=access point emergency=aed: Tag:emergency=aed emergency=ambulance_station: Tag:emergency=ambulance station @@ -7047,6 +8183,7 @@ en: emergency=defibrilator: Tag:emergency=defibrilator emergency=defibrillator: Tag:emergency=defibrillator emergency=disaster_response: Tag:emergency=disaster response + emergency=drinking_water: Tag:emergency=drinking water emergency=dry_riser: Tag:emergency=dry riser emergency=dry_riser_inlet: Tag:emergency=dry riser inlet emergency=emergency_ward_entrance: Tag:emergency=emergency ward entrance @@ -7085,17 +8222,33 @@ en: emergency=wet_riser: Tag:emergency=wet riser emergency=yes: Tag:emergency=yes emergency_service=technical: Tag:emergency service=technical + entrance=garage: Tag:entrance=garage entrance=main: Tag:entrance=main + entrance=main_entrance: Tag:entrance=main entrance entrance=staircase: Tag:entrance=staircase entrance=yes: Tag:entrance=yes esperanto=esperanto: Tag:esperanto=esperanto + esperanto=yes: Tag:esperanto=yes estuary=yes: Tag:estuary=yes + faculty=aerospace: Tag:faculty=aerospace fast_food=cafeteria: Tag:fast food=cafeteria + fixme=Position_estimated: Tag:fixme=Position estimated + flag:type=advertising: Tag:flag:type=advertising + flag:type=athletic: Tag:flag:type=athletic + flag:type=governmental: Tag:flag:type=governmental + flag:type=military: Tag:flag:type=military + flag:type=municipal: Tag:flag:type=municipal + flag:type=national: Tag:flag:type=national + flag:type=organisation: Tag:flag:type=organisation + flag:type=regional: Tag:flag:type=regional + flag:type=religious: Tag:flag:type=religious flood_mark=painting: Tag:flood mark=painting flood_mark=plaque: Tag:flood mark=plaque flow_direction=both: Tag:flow direction=both foot=designated: Tag:foot=designated foot=official: Tag:foot=official + foot=use_sidepath: Tag:foot=use sidepath + footway=access_aisle: Tag:footway=access aisle footway=crossing: Tag:footway=crossing footway=sidewalk: Tag:footway=sidewalk ford=boat: Tag:ford=boat @@ -7106,6 +8259,10 @@ en: fortification_type=ring_ditch: Tag:fortification type=ring ditch fortification_type=ringfort: Tag:fortification type=ringfort fortification_type=sconce: Tag:fortification type=sconce + fountain=bubbler: Tag:fountain=bubbler + fountain=drinking: Tag:fountain=drinking + fountain=nasone: Tag:fountain=nasone + fountain=roman_wolf: Tag:fountain=roman wolf garden:type=botanical: Tag:garden:type=botanical generator:method=anaerobic_digestion: Tag:generator:method=anaerobic digestion generator:method=barrage: Tag:generator:method=barrage @@ -7122,6 +8279,7 @@ en: generator:method=wind_turbine: Tag:generator:method=wind turbine generator:plant=intermediate: Tag:generator:plant=intermediate generator:plant=output: Tag:generator:plant=output + generator:source=battery: Tag:generator:source=battery generator:source=biofuel: Tag:generator:source=biofuel generator:source=biogas: Tag:generator:source=biogas generator:source=biomass: Tag:generator:source=biomass @@ -7159,25 +8317,34 @@ en: geological=moraine: Tag:geological=moraine geological=outcrop: Tag:geological=outcrop geological=palaeontological_site: Tag:geological=palaeontological site + glacier:type=mountain: Tag:glacier:type=mountain glideslope=yes: Tag:glideslope=yes golf=bunker: Tag:golf=bunker golf=cartpath: Tag:golf=cartpath + golf=clubhouse: Tag:golf=clubhouse golf=driving_range: Tag:golf=driving range golf=fairway: Tag:golf=fairway golf=green: Tag:golf=green golf=hole: Tag:golf=hole golf=lateral_water_hazard: Tag:golf=lateral water hazard golf=path: Tag:golf=path + golf=penalty_area: Tag:golf=penalty area golf=pin: Tag:golf=pin golf=rough: Tag:golf=rough golf=tee: Tag:golf=tee golf=water_hazard: Tag:golf=water hazard + government=administrative: Tag:government=administrative + government=aerospace: Tag:government=aerospace government=archive: Tag:government=archive government=audit: Tag:government=audit + government=border_control: Tag:government=border control government=cadaster: Tag:government=cadaster government=customs: Tag:government=customs + government=data_protection: Tag:government=data protection government=healthcare: Tag:government=healthcare + government=legislative: Tag:government=legislative government=ministry: Tag:government=ministry + government=parliament: Tag:government=parliament government=prosecutor: Tag:government=prosecutor government=register_office: Tag:government=register office government=statistics: Tag:government=statistics @@ -7205,17 +8372,69 @@ en: harbour:category=tourism: Tag:harbour:category=tourism harbour:category=yacht: Tag:harbour:category=yacht harbour=marina: Tag:harbour=marina + hazard=animal_crossing: Tag:hazard=animal crossing + hazard=bump: Tag:hazard=bump + hazard=children: Tag:hazard=children + hazard=contamination: Tag:hazard=contamination + hazard=curve: Tag:hazard=curve + hazard=curves: Tag:hazard=curves + hazard=cyclists: Tag:hazard=cyclists + hazard=dangerous_junction: Tag:hazard=dangerous junction + hazard=dip: Tag:hazard=dip + hazard=falling_rocks: Tag:hazard=falling rocks + hazard=frost_heave: Tag:hazard=frost heave + hazard=horse_riders: Tag:hazard=horse riders + hazard=ice: Tag:hazard=ice + hazard=landslide: Tag:hazard=landslide + hazard=loose_gravel: Tag:hazard=loose gravel + hazard=low_flying_aircraft: Tag:hazard=low flying aircraft + hazard=minefield: Tag:hazard=minefield + hazard=nuclear: Tag:hazard=nuclear + hazard=pedestrians: Tag:hazard=pedestrians + hazard=queues_likely: Tag:hazard=queues likely + hazard=school_zone: Tag:hazard=school zone + hazard=shooting_range: Tag:hazard=shooting range + hazard=side_winds: Tag:hazard=side winds + hazard=slippery: Tag:hazard=slippery + hazard=turn: Tag:hazard=turn + hazard=turns: Tag:hazard=turns + hazard=unexploded_ordnance: Tag:hazard=unexploded ordnance hazard_prone=yes: Tag:hazard prone=yes hazard_type=avalanche: Tag:hazard type=avalanche hazard_type=flood: Tag:hazard type=flood hazard_type=landslide: Tag:hazard type=landslide hazmat:water=permissive: Tag:hazmat:water=permissive + healthcare:speciality=abortion: Tag:healthcare:speciality=abortion + healthcare:speciality=vaccination: Tag:healthcare:speciality=vaccination + healthcare=alternative: Tag:healthcare=alternative + healthcare=audiologist: Tag:healthcare=audiologist + healthcare=birthing_center: Tag:healthcare=birthing center + healthcare=blood_bank: Tag:healthcare=blood bank healthcare=blood_donation: Tag:healthcare=blood donation + healthcare=centre: Tag:healthcare=centre + healthcare=clinic: Tag:healthcare=clinic + healthcare=community_health_worker: Tag:healthcare=community health worker + healthcare=counselling: Tag:healthcare=counselling healthcare=dentist: Tag:healthcare=dentist + healthcare=dialysis: Tag:healthcare=dialysis + healthcare=doctor: Tag:healthcare=doctor + healthcare=hospice: Tag:healthcare=hospice + healthcare=hospital: Tag:healthcare=hospital healthcare=laboratory: Tag:healthcare=laboratory + healthcare=midwife: Tag:healthcare=midwife + healthcare=nurse: Tag:healthcare=nurse healthcare=nutrition_counseling: Tag:healthcare=nutrition counseling healthcare=nutrition_counselling: Tag:healthcare=nutrition counselling + healthcare=occupational_therapist: Tag:healthcare=occupational therapist + healthcare=optometrist: Tag:healthcare=optometrist + healthcare=pharmacy: Tag:healthcare=pharmacy healthcare=physiotherapist: Tag:healthcare=physiotherapist + healthcare=podiatrist: Tag:healthcare=podiatrist + healthcare=psychotherapist: Tag:healthcare=psychotherapist + healthcare=rehabilitation: Tag:healthcare=rehabilitation + healthcare=speech_therapist: Tag:healthcare=speech therapist + healthcare=vaccination_centre: Tag:healthcare=vaccination centre + hgv=discouraged: Tag:hgv=discouraged highway=Bus_guideway: Tag:highway=Bus guideway highway=abandoned: Tag:highway=abandoned highway=access: Tag:highway=access @@ -7279,6 +8498,7 @@ en: highway=tertiary_link: Tag:highway=tertiary link highway=toll_booth: Tag:highway=toll booth highway=toll_gantry: Tag:highway=toll gantry + highway=tourist_bus_stop: Tag:highway=tourist bus stop highway=track: Tag:highway=track highway=traffic_mirror: Tag:highway=traffic mirror highway=traffic_signals: Tag:highway=traffic signals @@ -7300,6 +8520,7 @@ en: historic=battlefield: Tag:historic=battlefield historic=bomb_crater: Tag:historic=bomb crater historic=boundary_stone: Tag:historic=boundary stone + historic=building: Tag:historic=building historic=cannon: Tag:historic=cannon historic=castle: Tag:historic=castle historic=castle_wall: Tag:historic=castle wall @@ -7308,6 +8529,7 @@ en: historic=city_gate: Tag:historic=city gate historic=city_wall: Tag:historic=city wall historic=citywalls: Tag:historic=citywalls + historic=district: Tag:historic=district historic=event: Tag:historic=event historic=farm: Tag:historic=farm historic=flood_mark: Tag:historic=flood mark @@ -7315,6 +8537,7 @@ en: historic=gallows: Tag:historic=gallows historic=heritage: Tag:historic=heritage historic=highwater_mark: Tag:historic=highwater mark + historic=house: Tag:historic=house historic=locomotive: Tag:historic=locomotive historic=manor: Tag:historic=manor historic=memorial: Tag:historic=memorial @@ -7338,16 +8561,27 @@ en: historic=tomb: Tag:historic=tomb historic=tower: Tag:historic=tower historic=tree_shrine: Tag:historic=tree shrine + historic=vehicle: Tag:historic=vehicle + historic=wayside_chapel: Tag:historic=wayside chapel historic=wayside_cross: Tag:historic=wayside cross historic=wayside_shrine: Tag:historic=wayside shrine historic=wreck: Tag:historic=wreck + holding_position:type=ILS: Tag:holding position:type=ILS + holding_position:type=intermediate: Tag:holding position:type=intermediate + holding_position:type=runway: Tag:holding position:type=runway holding_position=ILS: Tag:holding position=ILS holding_position=intermediate: Tag:holding position=intermediate holding_position=runway: Tag:holding position=runway horse=designated: Tag:horse=designated + house=bungalow: Tag:house=bungalow + house=detached: Tag:house=detached + house=semi-detached: Tag:house=semi-detached + house=terrace: Tag:house=terrace + house=terraced: Tag:house=terraced hunting=raised_hide: Tag:hunting=raised hide indoor=area: Tag:indoor=area indoor=corridor: Tag:indoor=corridor + indoor=door: Tag:indoor=door indoor=room: Tag:indoor=room indoor=wall: Tag:indoor=wall indoormark=beacon: Tag:indoormark=beacon @@ -7359,6 +8593,8 @@ en: industrial=depot: Tag:industrial=depot industrial=distributor: Tag:industrial=distributor industrial=factory: Tag:industrial=factory + industrial=fish_farm: Tag:industrial=fish farm + industrial=food_industry: Tag:industrial=food industry industrial=furniture: Tag:industrial=furniture industrial=grinding_mill: Tag:industrial=grinding mill industrial=heating_station: Tag:industrial=heating station @@ -7378,14 +8614,19 @@ en: industrial=steelmaking: Tag:industrial=steelmaking industrial=warehouse: Tag:industrial=warehouse industrial=well_cluster: Tag:industrial=well cluster + industrial=wellsite: Tag:industrial=wellsite information=audioguide: Tag:information=audioguide information=board: Tag:information=board + information=finger-post: Tag:information=finger-post + information=finger_post: Tag:information=finger post + information=fingerpost: Tag:information=fingerpost information=guidepost: Tag:information=guidepost information=map: Tag:information=map information=office: Tag:information=office information=tactile_map: Tag:information=tactile map information=tactile_model: Tag:information=tactile model information=terminal: Tag:information=terminal + information=visitor_centre: Tag:information=visitor centre insurance=health: Tag:insurance=health internet_access=no: Tag:internet access=no internet_access=terminal: Tag:internet access=terminal @@ -7403,11 +8644,19 @@ en: junction=spui: Tag:junction=spui junction=yes: Tag:junction=yes karst=yes: Tag:karst=yes + landcover=dunes: Tag:landcover=dunes landcover=grass: Tag:landcover=grass landcover=gravel: Tag:landcover=gravel + landcover=greenery: Tag:landcover=greenery + landcover=hedge: Tag:landcover=hedge + landcover=sand: Tag:landcover=sand + landcover=shrub: Tag:landcover=shrub + landcover=shrubland: Tag:landcover=shrubland + landcover=shrubs: Tag:landcover=shrubs landcover=trees: Tag:landcover=trees - landform=esker: Tag:landform=esker - landform=raised_beach: Tag:landform=raised beach + landcover=water: Tag:landcover=water + landform=dune: Tag:landform=dune + landform=dune_system: Tag:landform=dune system landmark=beacon: Tag:landmark=beacon landmark=cairn: Tag:landmark=cairn landmark=cemetery: Tag:landmark=cemetery @@ -7445,6 +8694,7 @@ en: landuse=conservation: Tag:landuse=conservation landuse=construction: Tag:landuse=construction landuse=depot: Tag:landuse=depot + landuse=education: Tag:landuse=education landuse=farm: Tag:landuse=farm landuse=farmland: Tag:landuse=farmland landuse=farmyard: Tag:landuse=farmyard @@ -7459,8 +8709,8 @@ en: landuse=greenhouse_horticulture: Tag:landuse=greenhouse horticulture landuse=harbour: Tag:landuse=harbour landuse=highway: Tag:landuse=highway - landuse=hop_garden: Tag:landuse=hop garden landuse=industrial: Tag:landuse=industrial + landuse=institutional: Tag:landuse=institutional landuse=landfill: Tag:landuse=landfill landuse=logging: Tag:landuse=logging landuse=meadow: Tag:landuse=meadow @@ -7478,7 +8728,9 @@ en: landuse=railway: Tag:landuse=railway landuse=recreation_ground: Tag:landuse=recreation ground landuse=religious: Tag:landuse=religious + landuse=research: Tag:landuse=research landuse=reservoir: Tag:landuse=reservoir + landuse=reservoir_watershed: Tag:landuse=reservoir watershed landuse=residential: Tag:landuse=residential landuse=retail: Tag:landuse=retail landuse=salt_pond: Tag:landuse=salt pond @@ -7496,6 +8748,7 @@ en: landuse=wood: Tag:landuse=wood landuse=wood_(Don't_use): Tag:landuse=wood (Don't use) lane=buffered: Tag:lane=buffered + lawyer=notary: Tag:lawyer=notary leaf_cycle=deciduous: Tag:leaf cycle=deciduous leaf_cycle=evergreen: Tag:leaf cycle=evergreen leaf_cycle=mixed: Tag:leaf cycle=mixed @@ -7510,6 +8763,7 @@ en: leisure=amusement_arcade: Tag:leisure=amusement arcade leisure=arena: Tag:leisure=arena leisure=bandstand: Tag:leisure=bandstand + leisure=barefoot: Tag:leisure=barefoot leisure=bathing_place: Tag:leisure=bathing place leisure=bbq: Tag:leisure=bbq leisure=beach: Tag:leisure=beach @@ -7537,6 +8791,7 @@ en: leisure=horse_riding: Tag:leisure=horse riding leisure=hot_spring: Tag:leisure=hot spring leisure=ice_rink: Tag:leisure=ice rink + leisure=indoor_play: Tag:leisure=indoor play leisure=landscape_reserve: Tag:leisure=landscape reserve leisure=marina: Tag:leisure=marina leisure=miniature_golf: Tag:leisure=miniature golf @@ -7554,6 +8809,7 @@ en: leisure=resort: Tag:leisure=resort leisure=sailing_club: Tag:leisure=sailing club leisure=sauna: Tag:leisure=sauna + leisure=schoolyard: Tag:leisure=schoolyard leisure=shooting_ground: Tag:leisure=shooting ground leisure=ski_playground: Tag:leisure=ski playground leisure=slipway: Tag:leisure=slipway @@ -7571,6 +8827,7 @@ en: leisure=trampoline_park: Tag:leisure=trampoline park leisure=turkish_bath: Tag:leisure=turkish bath leisure=video_arcade: Tag:leisure=video arcade + leisure=village_swing: Tag:leisure=village swing leisure=water_park: Tag:leisure=water park leisure=wildlife_hide: Tag:leisure=wildlife hide level_crossing=automatic_barrier: Tag:level crossing=automatic barrier @@ -7582,6 +8839,17 @@ en: line=bay: Tag:line=bay line=busbar: Tag:line=busbar line=substation: Tag:line=substation + line_attachment=anchor: Tag:line attachment=anchor + line_attachment=pin: Tag:line attachment=pin + line_attachment=pulley: Tag:line attachment=pulley + line_attachment=suspension: Tag:line attachment=suspension + line_management=branch: Tag:line management=branch + line_management=cross: Tag:line management=cross + line_management=split: Tag:line management=split + line_management=straight: Tag:line management=straight + line_management=termination: Tag:line management=termination + line_management=transition: Tag:line management=transition + line_management=transpose: Tag:line management=transpose lines=phone: Tag:lines=phone locality=subtownland: Tag:locality=subtownland locality=townland: Tag:locality=townland @@ -7615,6 +8883,7 @@ en: man_made=cross: Tag:man made=cross man_made=cut_line: Tag:man made=cut line man_made=cutline: Tag:man made=cutline + man_made=desalination_plant: Tag:man made=desalination plant man_made=dike: Tag:man made=dike man_made=dolphin: Tag:man made=dolphin man_made=dovecote: Tag:man made=dovecote @@ -7626,18 +8895,20 @@ en: man_made=floating_storage: Tag:man made=floating storage man_made=footwear_decontamination: Tag:man made=footwear decontamination man_made=frost_fan: Tag:man made=frost fan + man_made=gantry: Tag:man made=gantry man_made=gas_well: Tag:man made=gas well man_made=gasometer: Tag:man made=gasometer man_made=geoglyph: Tag:man made=geoglyph man_made=goods_conveyor: Tag:man made=goods conveyor man_made=graduation_tower: Tag:man made=graduation tower - man_made=ground_station: Tag:man made=ground station man_made=groyne: Tag:man made=groyne man_made=guy: Tag:man made=guy man_made=hot_water_tank: Tag:man made=hot water tank + man_made=ice_house: Tag:man made=ice house man_made=insect_hotel: Tag:man made=insect hotel man_made=jetty: Tag:man made=jetty man_made=kiln: Tag:man made=kiln + man_made=launch_pad: Tag:man made=launch pad man_made=levee: Tag:man made=levee man_made=lighthouse: Tag:man made=lighthouse man_made=manhole: Tag:man made=manhole @@ -7659,6 +8930,7 @@ en: man_made=power_hydro: Tag:man made=power hydro man_made=power_nuclear: Tag:man made=power nuclear man_made=power_wind: Tag:man made=power wind + man_made=pump: Tag:man made=pump man_made=pumping_rig: Tag:man made=pumping rig man_made=pumping_station: Tag:man made=pumping station man_made=qanat: Tag:man made=qanat @@ -7668,18 +8940,23 @@ en: man_made=school_sentry: Tag:man made=school sentry man_made=septic_tank: Tag:man made=septic tank man_made=silo: Tag:man made=silo + man_made=ski_jump: Tag:man made=ski jump man_made=snow_cannon: Tag:man made=snow cannon man_made=snow_fence: Tag:man made=snow fence man_made=snow_net: Tag:man made=snow net man_made=spoil_heap: Tag:man made=spoil heap + man_made=spring_box: Tag:man made=spring box man_made=storage_tank: Tag:man made=storage tank man_made=street_cabinet: Tag:man made=street cabinet man_made=submarine_cable: Tag:man made=submarine cable + man_made=summit_cross: Tag:man made=summit cross man_made=surveillance: Tag:man made=surveillance man_made=survey_point: Tag:man made=survey point man_made=telescope: Tag:man made=telescope man_made=tell: Tag:man made=tell + man_made=threshing_floor: Tag:man made=threshing floor man_made=tower: Tag:man made=tower + man_made=tunnel: Tag:man made=tunnel man_made=utility_pole: Tag:man made=utility pole man_made=wastewater_plant: Tag:man made=wastewater plant man_made=water_tank: Tag:man made=water tank @@ -7696,10 +8973,18 @@ en: man_made=works: Tag:man made=works manhole=drain: Tag:manhole=drain manhole=telecom: Tag:manhole=telecom + map_type=topo: Tag:map type=topo maritime=yes: Tag:maritime=yes + marker=aerial: Tag:marker=aerial + marker=ground: Tag:marker=ground + marker=pedestal: Tag:marker=pedestal + marker=plate: Tag:marker=plate + marker=post: Tag:marker=post + marker=stone: Tag:marker=stone + material=concrete: Tag:material=concrete maxheight=default: Tag:maxheight=default + maxweight:signed=no: Tag:maxweight:signed=no medical=aed: Tag:medical=aed - medical=witchdoctor: Tag:medical=witchdoctor megalith_type=alignment: Tag:megalith type=alignment megalith_type=chamber: Tag:megalith type=chamber megalith_type=cist: Tag:megalith type=cist @@ -7720,6 +9005,7 @@ en: memorial:type=stolperstein: Tag:memorial:type=stolperstein memorial=blue_plaque: Tag:memorial=blue plaque memorial=bust: Tag:memorial=bust + memorial=cross: Tag:memorial=cross memorial=ghost_bike: Tag:memorial=ghost bike memorial=obelisk: Tag:memorial=obelisk memorial=plaque: Tag:memorial=plaque @@ -7737,6 +9023,7 @@ en: military=checkpoint: Tag:military=checkpoint military=danger_area: Tag:military=danger area military=exclusion_zone: Tag:military=exclusion zone + military=launchpad: Tag:military=launchpad military=naval_base: Tag:military=naval base military=nuclear_explosion_site: Tag:military=nuclear explosion site military=obstacle_course: Tag:military=obstacle course @@ -7744,6 +9031,7 @@ en: military=range: Tag:military=range military=training_area: Tag:military=training area military=trench: Tag:military=trench + mofa=use_sidepath: Tag:mofa=use sidepath mooring=commercial: Tag:mooring=commercial mooring=cruise: Tag:mooring=cruise mooring=declaration: Tag:mooring=declaration @@ -7754,9 +9042,11 @@ en: mooring=sbm: Tag:mooring=sbm mooring=spm: Tag:mooring=spm mooring=visitor: Tag:mooring=visitor + moped=use_sidepath: Tag:moped=use sidepath motorcycle:type=electric: Tag:motorcycle:type=electric motorcycle:type=sportbike: Tag:motorcycle:type=sportbike mountain_pass=yes: Tag:mountain pass=yes + museum=aerospace: Tag:museum=aerospace museum=archaeological: Tag:museum=archaeological museum=art: Tag:museum=art museum=children: Tag:museum=children @@ -7779,14 +9069,17 @@ en: name=Dollarama: Tag:name=Dollarama name=Domino's_Pizza: Tag:name=Domino's Pizza name=Herfy: Tag:name=Herfy + name=Jollibee: Tag:name=Jollibee name=KFC: Tag:name=KFC name=McDonald's: Tag:name=McDonald's name=Subway: Tag:name=Subway name=The_Church_of_Jesus_Christ_of_Latter-day_Saints: Tag:name=The Church of Jesus Christ of Latter-day Saints name=Walmart: Tag:name=Walmart + name=Wendy's: Tag:name=Wendy's name=Продукты: Tag:name=Продукты natural=anthill: Tag:natural=anthill + natural=arch: Tag:natural=arch natural=arete: Tag:natural=arete natural=atoll: Tag:natural=atoll natural=avalanche_dam: Tag:natural=avalanche dam @@ -7796,12 +9089,12 @@ en: natural=bedrock: Tag:natural=bedrock natural=birds_nest: Tag:natural=birds nest natural=blowhole: Tag:natural=blowhole - natural=breaker: Tag:natural=breaker natural=cape: Tag:natural=cape natural=cave_entrance: Tag:natural=cave entrance natural=cliff: Tag:natural=cliff natural=cloud: Tag:natural=cloud natural=coastline: Tag:natural=coastline + natural=col: Tag:natural=col natural=crater: Tag:natural=crater natural=crevasse: Tag:natural=crevasse natural=desert: Tag:natural=desert @@ -7867,11 +9160,18 @@ en: natural=water: Tag:natural=water natural=wetland: Tag:natural=wetland natural=wood: Tag:natural=wood + navigationaid=als: Tag:navigationaid=als + navigationaid=papi: Tag:navigationaid=papi + navigationaid=vasi: Tag:navigationaid=vasi nest_platform=yes: Tag:nest platform=yes network=BR: Tag:network=BR network=BR:ES: Tag:network=BR:ES network=BR:MG: Tag:network=BR:MG network=BR:PB: Tag:network=BR:PB + network=CN:AH: Tag:network=CN:AH + network=CN:JS: Tag:network=CN:JS + network=CN:national: Tag:network=CN:national + network=CR:national: Tag:network=CR:national network=Flinkster: Tag:network=Flinkster network=JP:national: Tag:network=JP:national network=JP:prefectural:nagano: Tag:network=JP:prefectural:nagano @@ -7883,6 +9183,7 @@ en: network=US:CA: Tag:network=US:CA network=US:CO: Tag:network=US:CO network=US:CT: Tag:network=US:CT + network=US:DC: Tag:network=US:DC network=US:DE: Tag:network=US:DE network=US:FL: Tag:network=US:FL network=US:FL:Toll: Tag:network=US:FL:Toll @@ -7902,6 +9203,7 @@ en: network=US:MI: Tag:network=US:MI network=US:MN: Tag:network=US:MN network=US:MO: Tag:network=US:MO + network=US:MO:Supplemental: Tag:network=US:MO:Supplemental network=US:MS: Tag:network=US:MS network=US:MT: Tag:network=US:MT network=US:MT:secondary: Tag:network=US:MT:secondary @@ -7917,6 +9219,7 @@ en: network=US:NJ:Passaic: Tag:network=US:NJ:Passaic network=US:NM: Tag:network=US:NM network=US:NV: Tag:network=US:NV + network=US:NV:Clark: Tag:network=US:NV:Clark network=US:NY: Tag:network=US:NY network=US:NY:Albany: Tag:network=US:NY:Albany network=US:NY:Allegany: Tag:network=US:NY:Allegany @@ -7965,19 +9268,25 @@ en: network=US:OH: Tag:network=US:OH network=US:OH:ASD: Tag:network=US:OH:ASD network=US:OH:ATH: Tag:network=US:OH:ATH + network=US:OH:AUG: Tag:network=US:OH:AUG network=US:OH:BEL: Tag:network=US:OH:BEL network=US:OH:CAR: Tag:network=US:OH:CAR network=US:OH:COL: Tag:network=US:OH:COL network=US:OH:COS: Tag:network=US:OH:COS + network=US:OH:FAI: Tag:network=US:OH:FAI network=US:OH:FAY: Tag:network=US:OH:FAY network=US:OH:FUL: Tag:network=US:OH:FUL + network=US:OH:GAL: Tag:network=US:OH:GAL network=US:OH:GUE: Tag:network=US:OH:GUE + network=US:OH:HAM: Tag:network=US:OH:HAM network=US:OH:HAR: Tag:network=US:OH:HAR network=US:OH:HAS: Tag:network=US:OH:HAS network=US:OH:HEN: Tag:network=US:OH:HEN network=US:OH:HOC: Tag:network=US:OH:HOC network=US:OH:HOL: Tag:network=US:OH:HOL network=US:OH:JEF: Tag:network=US:OH:JEF + network=US:OH:KNO: Tag:network=US:OH:KNO + network=US:OH:LAW: Tag:network=US:OH:LAW network=US:OH:LIC: Tag:network=US:OH:LIC network=US:OH:LOG: Tag:network=US:OH:LOG network=US:OH:LOG:Jefferson: Tag:network=US:OH:LOG:Jefferson @@ -7985,6 +9294,7 @@ en: network=US:OH:LOG:Monroe: Tag:network=US:OH:LOG:Monroe network=US:OH:LOG:Pleasant: Tag:network=US:OH:LOG:Pleasant network=US:OH:LUC: Tag:network=US:OH:LUC + network=US:OH:MAD: Tag:network=US:OH:MAD network=US:OH:MAH: Tag:network=US:OH:MAH network=US:OH:MED: Tag:network=US:OH:MED network=US:OH:MED:Harrisville: Tag:network=US:OH:MED:Harrisville @@ -7992,12 +9302,14 @@ en: network=US:OH:MED:Sharon: Tag:network=US:OH:MED:Sharon network=US:OH:MED:Wadsworth: Tag:network=US:OH:MED:Wadsworth network=US:OH:MOE: Tag:network=US:OH:MOE + network=US:OH:MRG: Tag:network=US:OH:MRG network=US:OH:MRW: Tag:network=US:OH:MRW network=US:OH:OTT: Tag:network=US:OH:OTT network=US:OH:PAU: Tag:network=US:OH:PAU network=US:OH:PER: Tag:network=US:OH:PER network=US:OH:POR: Tag:network=US:OH:POR network=US:OH:SAN:Fremont: Tag:network=US:OH:SAN:Fremont + network=US:OH:SCI: Tag:network=US:OH:SCI network=US:OH:SEN: Tag:network=US:OH:SEN network=US:OH:STA: Tag:network=US:OH:STA network=US:OH:SUM: Tag:network=US:OH:SUM @@ -8015,6 +9327,7 @@ en: network=US:OK: Tag:network=US:OK network=US:OR: Tag:network=US:OR network=US:PA: Tag:network=US:PA + network=US:PA:Turnpike: Tag:network=US:PA:Turnpike network=US:RI: Tag:network=US:RI network=US:SC: Tag:network=US:SC network=US:SD: Tag:network=US:SD @@ -8024,12 +9337,16 @@ en: network=US:TX:FM: Tag:network=US:TX:FM network=US:TX:Loop: Tag:network=US:TX:Loop network=US:TX:NASA: Tag:network=US:TX:NASA + network=US:TX:Park: Tag:network=US:TX:Park network=US:TX:RM: Tag:network=US:TX:RM + network=US:TX:Recreational: Tag:network=US:TX:Recreational network=US:TX:Spur: Tag:network=US:TX:Spur network=US:TX:Wood: Tag:network=US:TX:Wood network=US:US: Tag:network=US:US network=US:UT: Tag:network=US:UT network=US:VA: Tag:network=US:VA + network=US:VA:Secondary: Tag:network=US:VA:Secondary + network=US:VA:secondary: Tag:network=US:VA:secondary network=US:VT: Tag:network=US:VT network=US:WA: Tag:network=US:WA network=US:WI: Tag:network=US:WI @@ -8038,11 +9355,14 @@ en: network=US:WV:McDowell: Tag:network=US:WV:McDowell network=US:WV:Mercer: Tag:network=US:WV:Mercer network=US:WY: Tag:network=US:WY + network=VE:L:PO: Tag:network=VE:L:PO network=VE:R:PO: Tag:network=VE:R:PO + network=VE:T:PO: Tag:network=VE:T:PO network=VE:ramal:portuguesa: Tag:network=VE:ramal:portuguesa network=call-a-bike: Tag:network=call-a-bike network=cambio/stadtmobil: Tag:network=cambio/stadtmobil network=cambio_stadtmobil: Tag:network=cambio stadtmobil + network=e-waterway: Tag:network=e-waterway network=icn: Tag:network=icn network=iwn: Tag:network=iwn network=jp:national: Tag:network=jp:national @@ -8060,8 +9380,11 @@ en: network=rmn: Tag:network=rmn network=rpn: Tag:network=rpn network=rwn: Tag:network=rwn + nhd:fcode=46003: Tag:nhd:fcode=46003 + nhd:ftype=StreamRiver: Tag:nhd:ftype=StreamRiver noexit=no: Tag:noexit=no observatory:type=astronomical: Tag:observatory:type=astronomical + observatory:type=gravitational: Tag:observatory:type=gravitational observatory:type=meteorological: Tag:observatory:type=meteorological odbl=clean: Tag:odbl=clean office:realtor: Tag:office:realtor @@ -8074,6 +9397,7 @@ en: office=bail_bond_agent: Tag:office=bail bond agent office=charity: Tag:office=charity office=company: Tag:office=company + office=consulting: Tag:office=consulting office=coworking: Tag:office=coworking office=diplomatic: Tag:office=diplomatic office=educational_institution: Tag:office=educational institution @@ -8086,11 +9410,15 @@ en: office=foundation: Tag:office=foundation office=geodesist: Tag:office=geodesist office=government: Tag:office=government + office=graphic_design: Tag:office=graphic design office=guide: Tag:office=guide + office=healthcare: Tag:office=healthcare office=insurance: Tag:office=insurance + office=international_organization: Tag:office=international organization office=it: Tag:office=it office=lawyer: Tag:office=lawyer office=logistics: Tag:office=logistics + office=medical: Tag:office=medical office=moving_company: Tag:office=moving company office=newspaper: Tag:office=newspaper office=ngo: Tag:office=ngo @@ -8107,6 +9435,8 @@ en: office=register: Tag:office=register office=religion: Tag:office=religion office=research: Tag:office=research + office=security: Tag:office=security + office=supervised_injection_site: Tag:office=supervised injection site office=surveyor: Tag:office=surveyor office=tax: Tag:office=tax office=tax_advisor: Tag:office=tax advisor @@ -8114,24 +9444,34 @@ en: office=therapist: Tag:office=therapist office=tourist_accommodation: Tag:office=tourist accommodation office=travel_agent: Tag:office=travel agent + office=union: Tag:office=union + office=university: Tag:office=university office=visa: Tag:office=visa office=water_utility: Tag:office=water utility office=yes: Tag:office=yes + oneway:bicycle=yes: Tag:oneway:bicycle=yes + oneway=-1: Tag:oneway=-1 oneway=alternating: Tag:oneway=alternating oneway=reversible: Tag:oneway=reversible opening_hours:signed=no: Tag:opening hours:signed=no + operational_status=closed: Tag:operational status=closed operator=Cambio: Tag:operator=Cambio operator=CiteeCar: Tag:operator=CiteeCar operator=Drive_Carsharing: Tag:operator=Drive Carsharing operator=Flinkster: Tag:operator=Flinkster + operator=GRDF: Tag:operator=GRDF operator=Stadtmobil: Tag:operator=Stadtmobil operator=book-n-drive: Tag:operator=book-n-drive operator=cambio: Tag:operator=cambio operator=independent: Tag:operator=independent operator=stadtmobil: Tag:operator=stadtmobil operator=teilAuto: Tag:operator=teilAuto + orchard=meadow_orchard: Tag:orchard=meadow orchard parking:lane:hgv=on_street: Tag:parking:lane:hgv=on street + parking=lane: Tag:parking=lane + parking=layby: Tag:parking=layby parking=multi-storey: Tag:parking=multi-storey + parking=street_side: Tag:parking=street side parking=surface: Tag:parking=surface parking=underground: Tag:parking=underground passenger=international: Tag:passenger=international @@ -8142,7 +9482,9 @@ en: passenger=suburban: Tag:passenger=suburban passenger=urban: Tag:passenger=urban passenger=yes: Tag:passenger=yes + path=crossing: Tag:path=crossing path=desire: Tag:path=desire + physically_present=no: Tag:physically present=no pilotage=boarding_point: Tag:pilotage=boarding point pilotage=office: Tag:pilotage=office pipeline=marker: Tag:pipeline=marker @@ -8152,6 +9494,8 @@ en: piste:type=connection: Tag:piste:type=connection piste:type=downhill: Tag:piste:type=downhill piste:type=nordic: Tag:piste:type=nordic + piste:type=ski_jump: Tag:piste:type=ski jump + piste:type=ski_jump_landing: Tag:piste:type=ski jump landing place=allotments: Tag:place=allotments place=archipelago: Tag:place=archipelago place=borough: Tag:place=borough @@ -8183,8 +9527,14 @@ en: place=village: Tag:place=village placement=right_of:1: Tag:placement=right of:1 placement=transition: Tag:placement=transition + plant:method=combustion: Tag:plant:method=combustion + plant:method=gasification: Tag:plant:method=gasification plant:method=photovoltaic: Tag:plant:method=photovoltaic + plant:method=run-of-the-river: Tag:plant:method=run-of-the-river plant:method=thermal: Tag:plant:method=thermal + plant:method=water-pumped-storage: Tag:plant:method=water-pumped-storage + plant:method=water-storage: Tag:plant:method=water-storage + plant:source=battery: Tag:plant:source=battery plant:source=biomass: Tag:plant:source=biomass plant:source=coal: Tag:plant:source=coal plant:source=gas: Tag:plant:source=gas @@ -8195,9 +9545,14 @@ en: plant:source=solar: Tag:plant:source=solar plant:source=waste: Tag:plant:source=waste plant:source=wind: Tag:plant:source=wind + plant:type=combined_cycle: Tag:plant:type=combined cycle + plant:type=gas_turbine: Tag:plant:type=gas turbine + plant:type=solar_photovoltaic_panel: Tag:plant:type=solar photovoltaic panel + plant:type=steam_turbine: Tag:plant:type=steam turbine playground=slide: Tag:playground=slide playground=structure: Tag:playground=structure pole=transition: Tag:pole=transition + police=academy: Tag:police=academy police=barracks: Tag:police=barracks police=car_pound: Tag:police=car pound police=car_repair: Tag:police=car repair @@ -8214,7 +9569,9 @@ en: power=cable: Tag:power=cable power=cable_distribution_cabinet: Tag:power=cable distribution cabinet power=catenary_mast: Tag:power=catenary mast + power=circuit: Tag:power=circuit power=compensator: Tag:power=compensator + power=connection: Tag:power=connection power=converter: Tag:power=converter power=generator: Tag:power=generator power=grounding: Tag:power=grounding @@ -8242,6 +9599,16 @@ en: prison_camp=concentration_camp: Tag:prison camp=concentration camp prison_camp=extermination_camp: Tag:prison camp=extermination camp private=employees: Tag:private=employees + protect_class=19: Tag:protect class=19 + protect_class=1a: Tag:protect class=1a + protect_class=1b: Tag:protect class=1b + protect_class=2: Tag:protect class=2 + protect_class=21: Tag:protect class=21 + protect_class=3: Tag:protect class=3 + protect_class=4: Tag:protect class=4 + protect_class=5: Tag:protect class=5 + protect_class=6: Tag:protect class=6 + protected_area=nature_reserve: Tag:protected area=nature reserve pseudo=yes: Tag:pseudo=yes psv=designated: Tag:psv=designated public_transport=pay_scale_area: Tag:public transport=pay scale area @@ -8272,6 +9639,7 @@ en: radio_transponder:category=directional: Tag:radio transponder:category=directional radio_transponder:category=rotating_pattern: Tag:radio transponder:category=rotating pattern + railway:radio=gsm-r: Tag:railway:radio=gsm-r railway=PRT: Tag:railway=PRT railway=Subway: Tag:railway=Subway railway=abandoned: Tag:railway=abandoned @@ -8305,7 +9673,10 @@ en: railway=subway: Tag:railway=subway railway=subway_entrance: Tag:railway=subway entrance railway=switch: Tag:railway=switch + railway=train_station_entrance: Tag:railway=train station entrance railway=tram: Tag:railway=tram + railway=tram_crossing: Tag:railway=tram crossing + railway=tram_level_crossing: Tag:railway=tram level crossing railway=tram_stop: Tag:railway=tram stop railway=traverser: Tag:railway=traverser railway=turntable: Tag:railway=turntable @@ -8313,7 +9684,10 @@ en: railway=water_crane: Tag:railway=water crane railway=water_tower: Tag:railway=water tower railway=yard: Tag:railway=yard + reclaimed=yes: Tag:reclaimed=yes + recycling_type=centre: Tag:recycling type=centre refitted=yes: Tag:refitted=yes + refugee=yes: Tag:refugee=yes religion=buddhist: Tag:religion=buddhist religion=christian: Tag:religion=christian religion=hindu: Tag:religion=hindu @@ -8327,10 +9701,15 @@ en: religion=sikh: Tag:religion=sikh religion=taoist: Tag:religion=taoist religion=zoroastrian: Tag:religion=zoroastrian + rental=appliance: Tag:rental=appliance rental=ski: Tag:rental=ski rental=strandkorb: Tag:rental=strandkorb rental=trailer: Tag:rental=trailer repair=assisted_self_service: Tag:repair=assisted self service + request_stop=yes: Tag:request stop=yes + research=aerospace: Tag:research=aerospace + residential=apartments: Tag:residential=apartments + residential=halting_site: Tag:residential=halting site residential=rural: Tag:residential=rural residential=university: Tag:residential=university residential=urban: Tag:residential=urban @@ -8338,9 +9717,11 @@ en: resource=gravel: Tag:resource=gravel resource=sand: Tag:resource=sand rfr=yes: Tag:rfr=yes + road_marking=solid_stop_line: Tag:road marking=solid stop line roller_coaster=track: Tag:roller coaster=track route=aqueduct: Tag:route=aqueduct route=bicycle: Tag:route=bicycle + route=boat: Tag:route=boat route=bus: Tag:route=bus route=canal: Tag:route=canal route=canoe: Tag:route=canoe @@ -8358,6 +9739,7 @@ en: route=minibus: Tag:route=minibus route=monorail: Tag:route=monorail route=motorboat: Tag:route=motorboat + route=mtb: Tag:route=mtb route=ncn: Tag:route=ncn route=nordic_walking: Tag:route=nordic walking route=pipeline: Tag:route=pipeline @@ -8367,12 +9749,14 @@ en: route=running: Tag:route=running route=share_taxi: Tag:route=share taxi route=ski: Tag:route=ski + route=snowmobile: Tag:route=snowmobile route=subway: Tag:route=subway route=tracks: Tag:route=tracks route=train: Tag:route=train route=tram: Tag:route=tram route=transhumance: Tag:route=transhumance route=trolleybus: Tag:route=trolleybus + route=waterway: Tag:route=waterway route=worship: Tag:route=worship sailing:tours=yes: Tag:sailing:tours=yes seamark:beacon_cardinal:colour_pattern=horizontal: Tag:seamark:beacon cardinal:colour @@ -8482,6 +9866,8 @@ en: seamark:distance_mark:category=board: Tag:seamark:distance mark:category=board seamark:distance_mark:category=not_installed: Tag:seamark:distance mark:category=not installed + seamark:distance_mark:units=hectometres: Tag:seamark:distance mark:units=hectometres + seamark:distance_mark:units=kilometres: Tag:seamark:distance mark:units=kilometres seamark:fog_signal:category=bell: Tag:seamark:fog signal:category=bell seamark:fog_signal:category=diaphone: Tag:seamark:fog signal:category=diaphone seamark:fog_signal:category=explosive: Tag:seamark:fog signal:category=explosive @@ -8510,7 +9896,6 @@ en: seamark:landmark:category=spire: Tag:seamark:landmark:category=spire seamark:landmark:category=statue: Tag:seamark:landmark:category=statue seamark:landmark:category=tower: Tag:seamark:landmark:category=tower - seamark:landmark:category=water_tower: Tag:seamark:landmark:category=water tower seamark:landmark:category=windmill: Tag:seamark:landmark:category=windmill seamark:landmark:category=windmotor: Tag:seamark:landmark:category=windmotor seamark:landmark:category=windsock: Tag:seamark:landmark:category=windsock @@ -8693,23 +10078,30 @@ en: service=aircraft_control: Tag:service=aircraft control service=alley: Tag:service=alley service=bus: Tag:service=bus + service=busway: Tag:service=busway service=crossover: Tag:service=crossover + service=dealer: Tag:service=dealer service=drive-through: Tag:service=drive-through service=drive_through: Tag:service=drive through service=driveway: Tag:service=driveway + service=driveway2: Tag:service=driveway2 service=emergency_access: Tag:service=emergency access service=irrigation: Tag:service=irrigation service=parking_aisle: Tag:service=parking aisle service=parts: Tag:service=parts + service=repair: Tag:service=repair service=siding: Tag:service=siding service=spur: Tag:service=spur + service=tyres: Tag:service=tyres service=yard: Tag:service=yard shelter_type=basic_hut: Tag:shelter type=basic hut shelter_type=field_shelter: Tag:shelter type=field shelter shelter_type=lean_to: Tag:shelter type=lean to shelter_type=picnic_shelter: Tag:shelter type=picnic shelter shelter_type=public_transport: Tag:shelter type=public transport + shelter_type=weather_shelter: Tag:shelter type=weather shelter shop=*: Tag:shop=* + shop=3d_printing: Tag:shop=3d printing shop=Alko: Tag:shop=Alko shop=_business_machines: Tag:shop= business machines shop=adult: Tag:shop=adult @@ -8838,8 +10230,10 @@ en: shop=hearing_aid_dispenser: Tag:shop=hearing aid dispenser shop=hearing_aids: Tag:shop=hearing aids shop=herbalist: Tag:shop=herbalist + shop=hgv: Tag:shop=hgv shop=hifi: Tag:shop=hifi shop=hobby: Tag:shop=hobby + shop=honey: Tag:shop=honey shop=hookah: Tag:shop=hookah shop=household_linen: Tag:shop=household linen shop=houseware: Tag:shop=houseware @@ -8871,16 +10265,19 @@ en: shop=military_surplus: Tag:shop=military surplus shop=mobile_home: Tag:shop=mobile home shop=mobile_phone: Tag:shop=mobile phone + shop=mobility_scooter: Tag:shop=mobility scooter shop=model: Tag:shop=model shop=money_lender: Tag:shop=money lender shop=moneylender: Tag:shop=moneylender shop=motorcycle: Tag:shop=motorcycle + shop=motorcycle_parts: Tag:shop=motorcycle parts shop=motorcycle_repair: Tag:shop=motorcycle repair shop=motorhome: Tag:shop=motorhome shop=music: Tag:shop=music shop=musical_instrument: Tag:shop=musical instrument shop=musical_instruments: Tag:shop=musical instruments shop=newsagent: Tag:shop=newsagent + shop=no: Tag:shop=no shop=nutrition_supplements: Tag:shop=nutrition supplements shop=nuts: Tag:shop=nuts shop=office_supplies: Tag:shop=office supplies @@ -8905,13 +10302,16 @@ en: shop=pottery: Tag:shop=pottery shop=printer_ink: Tag:shop=printer ink shop=printing: Tag:shop=printing + shop=psychic: Tag:shop=psychic shop=pyrotechnics: Tag:shop=pyrotechnics shop=pépinière: Tag:shop=pépinière shop=radiotechnics: Tag:shop=radiotechnics shop=recreational_vehicle: Tag:shop=recreational vehicle shop=religion: Tag:shop=religion shop=rental: Tag:shop=rental + shop=rice: Tag:shop=rice shop=robot: Tag:shop=robot + shop=scooter: Tag:shop=scooter shop=scuba_diving: Tag:shop=scuba diving shop=seafood: Tag:shop=seafood shop=second_hand: Tag:shop=second hand @@ -8921,6 +10321,7 @@ en: shop=shoe_repair: Tag:shop=shoe repair shop=shoes: Tag:shop=shoes shop=shopping_centre: Tag:shop=shopping centre + shop=skate: Tag:shop=skate shop=ski: Tag:shop=ski shop=snowmobile: Tag:shop=snowmobile shop=solarium: Tag:shop=solarium @@ -8932,6 +10333,7 @@ en: shop=storage_rental: Tag:shop=storage rental shop=street_vendor: Tag:shop=street vendor shop=supermarket: Tag:shop=supermarket + shop=surf: Tag:shop=surf shop=swimming_pool: Tag:shop=swimming pool shop=systembolaget: Tag:shop=systembolaget shop=tailor: Tag:shop=tailor @@ -8942,12 +10344,16 @@ en: shop=tiles: Tag:shop=tiles shop=tobacco: Tag:shop=tobacco shop=tool_hire: Tag:shop=tool hire + shop=tools: Tag:shop=tools shop=toy: Tag:shop=toy shop=toys: Tag:shop=toys + shop=tractor: Tag:shop=tractor shop=trade: Tag:shop=trade shop=trailer: Tag:shop=trailer shop=travel_agency: Tag:shop=travel agency shop=trophy: Tag:shop=trophy + shop=truck: Tag:shop=truck + shop=truck_repair: Tag:shop=truck repair shop=tyres: Tag:shop=tyres shop=underwear: Tag:shop=underwear shop=vacant: Tag:shop=vacant @@ -8984,11 +10390,13 @@ en: signal_station=time: Tag:signal station=time signal_station=traffic: Tag:signal station=traffic signal_station=weather: Tag:signal station=weather + signpost=forestry_compartment: Tag:signpost=forestry compartment sinkhole=bluehole: Tag:sinkhole=bluehole sinkhole=doline: Tag:sinkhole=doline sinkhole=estavelle: Tag:sinkhole=estavelle sinkhole=pit: Tag:sinkhole=pit sinkhole=ponor: Tag:sinkhole=ponor + site=parking: Tag:site=parking site=piste: Tag:site=piste site_type=bigstone: Tag:site type=bigstone site_type=city: Tag:site type=city @@ -9024,6 +10432,7 @@ en: source:geometry=NPWS_Estate: Tag:source:geometry=NPWS Estate source:geometry=NSW_LPI_Base_Map: Tag:source:geometry=NSW LPI Base Map source:geometry=NSW_LPI_Imagery: Tag:source:geometry=NSW LPI Imagery + source:geometry=PSMA_Admin_Boundaries: Tag:source:geometry=PSMA Admin Boundaries source:maxspeed=implicit: Tag:source:maxspeed=implicit source:name=LPI_NSW_Base_Map: Tag:source:name=LPI NSW Base Map source:name=NPWS_Estate: Tag:source:name=NPWS Estate @@ -9050,10 +10459,13 @@ en: source=NSW_LPI_Imagery: Tag:source=NSW LPI Imagery source=Naturbase: Tag:source=Naturbase source=PGS: Tag:source=PGS + source=PSMA_Admin_Boundaries: Tag:source=PSMA Admin Boundaries source=RABA-KGZ: Tag:source=RABA-KGZ source=SA_Conservation_Reserve_Boundaries: Tag:source=SA Conservation Reserve Boundaries source=Schadow1_Expeditions: Tag:source=Schadow1 Expeditions + source=Swedish_Environmental_Agency_Trails: Tag:source=Swedish Environmental Agency + Trails source=VicMap_ParkRes: Tag:source=VicMap ParkRes source=YahooJapan/ALPSMAP: Tag:source=YahooJapan/ALPSMAP source=gurs: Tag:source=gurs @@ -9075,6 +10487,7 @@ en: sport=basketball: Tag:sport=basketball sport=batting_cage: Tag:sport=batting cage sport=beachvolleyball: Tag:sport=beachvolleyball + sport=biathlon: Tag:sport=biathlon sport=billards: Tag:sport=billards sport=billiards: Tag:sport=billiards sport=bmx: Tag:sport=bmx @@ -9082,10 +10495,12 @@ en: sport=boules: Tag:sport=boules sport=bowls: Tag:sport=bowls sport=boxing: Tag:sport=boxing + sport=bullfighting: Tag:sport=bullfighting sport=canadian_football: Tag:sport=canadian football sport=canoe: Tag:sport=canoe sport=canoe_polo: Tag:sport=canoe polo sport=chess: Tag:sport=chess + sport=chinlone: Tag:sport=chinlone sport=cliff_diving: Tag:sport=cliff diving sport=climbing: Tag:sport=climbing sport=climbing_adventure: Tag:sport=climbing adventure @@ -9093,18 +10508,21 @@ en: sport=cricket: Tag:sport=cricket sport=cricket_nets: Tag:sport=cricket nets sport=croquet: Tag:sport=croquet + sport=crossfit: Tag:sport=crossfit sport=curling: Tag:sport=curling sport=cycling: Tag:sport=cycling sport=dancing: Tag:sport=dancing sport=darts: Tag:sport=darts sport=disc_golf: Tag:sport=disc golf sport=diving: Tag:sport=diving + sport=dog_agility: Tag:sport=dog agility sport=dog_racing: Tag:sport=dog racing sport=equestrian: Tag:sport=equestrian sport=fencing: Tag:sport=fencing sport=field_hockey: Tag:sport=field hockey sport=fitness: Tag:sport=fitness sport=fives: Tag:sport=fives + sport=floorball: Tag:sport=floorball sport=footballgolf: Tag:sport=footballgolf sport=free_flying: Tag:sport=free flying sport=futsal: Tag:sport=futsal @@ -9123,15 +10541,21 @@ en: sport=judo: Tag:sport=judo sport=karate: Tag:sport=karate sport=karting: Tag:sport=karting + sport=kickboxing: Tag:sport=kickboxing sport=kitesurfing: Tag:sport=kitesurfing sport=korfball: Tag:sport=korfball + sport=krachtbal: Tag:sport=krachtbal sport=lacrosse: Tag:sport=lacrosse sport=laser_tag: Tag:sport=laser tag + sport=long_jump: Tag:sport=long jump + sport=martial_arts: Tag:sport=martial arts + sport=miniature_golf: Tag:sport=miniature golf sport=model_aerodrome: Tag:sport=model aerodrome sport=motocross: Tag:sport=motocross sport=motor: Tag:sport=motor sport=multi: Tag:sport=multi sport=netball: Tag:sport=netball + sport=nine_mens_morris: Tag:sport=nine mens morris sport=obstacle_course: Tag:sport=obstacle course sport=orienteering: Tag:sport=orienteering sport=paddle_tennis: Tag:sport=paddle tennis @@ -9139,10 +10563,18 @@ en: sport=paintball: Tag:sport=paintball sport=parachuting: Tag:sport=parachuting sport=paragliding: Tag:sport=paragliding + sport=parkour: Tag:sport=parkour sport=pelota: Tag:sport=pelota + sport=pesäpallo: Tag:sport=pesäpallo + sport=petanque: Tag:sport=petanque + sport=pickeball: Tag:sport=pickeball + sport=pickleball: Tag:sport=pickleball + sport=pilates: Tag:sport=pilates sport=pole_dance: Tag:sport=pole dance + sport=polo: Tag:sport=polo sport=racquet: Tag:sport=racquet sport=rc_car: Tag:sport=rc car + sport=roller_hockey: Tag:sport=roller hockey sport=roller_skating: Tag:sport=roller skating sport=rowing: Tag:sport=rowing sport=rugby: Tag:sport=rugby @@ -9154,10 +10586,16 @@ en: sport=shooting: Tag:sport=shooting sport=shooting_range: Tag:sport=shooting range sport=shot-put: Tag:sport=shot-put + sport=shuffleboard: Tag:sport=shuffleboard sport=skateboard: Tag:sport=skateboard sport=skating: Tag:sport=skating + sport=ski_jumping: Tag:sport=ski jumping sport=skiing: Tag:sport=skiing + sport=snooker: Tag:sport=snooker sport=soccer: Tag:sport=soccer + sport=softball: Tag:sport=softball + sport=speedway: Tag:sport=speedway + sport=squash: Tag:sport=squash sport=sumo: Tag:sport=sumo sport=surfing: Tag:sport=surfing sport=swimming: Tag:sport=swimming @@ -9168,7 +10606,9 @@ en: sport=tennis: Tag:sport=tennis sport=toboggan: Tag:sport=toboggan sport=trampoline: Tag:sport=trampoline + sport=ultimate: Tag:sport=ultimate sport=volleyball: Tag:sport=volleyball + sport=wakeboarding: Tag:sport=wakeboarding sport=water_polo: Tag:sport=water polo sport=water_ski: Tag:sport=water ski sport=weightlifting: Tag:sport=weightlifting @@ -9181,6 +10621,12 @@ en: station=funicular: Tag:station=funicular station=light_rail: Tag:station=light rail station=subway: Tag:station=subway + stream=intermittent: Tag:stream=intermittent + street_vendor=yes: Tag:street vendor=yes + studio=audio: Tag:studio=audio + studio=radio: Tag:studio=radio + studio=television: Tag:studio=television + studio=video: Tag:studio=video submarine=yes: Tag:submarine=yes substation=compensation: Tag:substation=compensation substation=converter: Tag:substation=converter @@ -9193,7 +10639,10 @@ en: substation=transition: Tag:substation=transition substation=transmission: Tag:substation=transmission summit:cross=yes: Tag:summit:cross=yes + surface=acrylic: Tag:surface=acrylic + surface=artificial_turf: Tag:surface=artificial turf surface=asphalt: Tag:surface=asphalt + surface=clay: Tag:surface=clay surface=cobblestone: Tag:surface=cobblestone surface=compacted: Tag:surface=compacted surface=concrete: Tag:surface=concrete @@ -9202,7 +10651,9 @@ en: surface=metal: Tag:surface=metal surface=paved: Tag:surface=paved surface=paving_stones: Tag:surface=paving stones + surface=rock: Tag:surface=rock surface=sett: Tag:surface=sett + surface=tartan: Tag:surface=tartan surface=unhewn_cobblestone: Tag:surface=unhewn cobblestone surface=unpaved: Tag:surface=unpaved surface=wood: Tag:surface=wood @@ -9211,15 +10662,21 @@ en: switch=disconnector: Tag:switch=disconnector switch=earthing: Tag:switch=earthing switch=mechanical: Tag:switch=mechanical + tactile_paving=incorrect: Tag:tactile paving=incorrect + tactile_paving=no: Tag:tactile paving=no + tactile_paving=partial: Tag:tactile paving=partial + tactile_paving=yes: Tag:tactile paving=yes tank_trap=czech_hedgehog: Tag:tank trap=czech hedgehog telecom:medium=coaxial: Tag:telecom:medium=coaxial telecom:medium=copper: Tag:telecom:medium=copper telecom:medium=fibre: Tag:telecom:medium=fibre + telecom=antenna: Tag:telecom=antenna telecom=connection_point: Tag:telecom=connection point telecom=cross-connect: Tag:telecom=cross-connect telecom=data_center: Tag:telecom=data center telecom=data_centre: Tag:telecom=data centre telecom=datacenter: Tag:telecom=datacenter + telecom=distribution_point: Tag:telecom=distribution point telecom=exchange: Tag:telecom=exchange telecom=remote_digital_terminal: Tag:telecom=remote digital terminal telecom=remote_terminal: Tag:telecom=remote terminal @@ -9227,15 +10684,22 @@ en: telescope:type=optical: Tag:telescope:type=optical telescope:type=radio: Tag:telescope:type=radio theatre:type=amphi: Tag:theatre:type=amphi + theatre:type=concert_hall: Tag:theatre:type=concert hall theatre:type=open_air: Tag:theatre:type=open air + theatre:type=opera_house: Tag:theatre:type=opera house tickets:public_transport_subscription=yes: Tag:tickets:public transport subscription=yes + toll=yes: Tag:toll=yes + tomb=cenotaph: Tag:tomb=cenotaph tomb=columbarium: Tag:tomb=columbarium tomb=crypt: Tag:tomb=crypt tomb=hypogeum: Tag:tomb=hypogeum tomb=mausoleum: Tag:tomb=mausoleum + tomb=obelisk: Tag:tomb=obelisk + tomb=pillar: Tag:tomb=pillar tomb=pyramid: Tag:tomb=pyramid tomb=rock-cut: Tag:tomb=rock-cut tomb=sarcophagus: Tag:tomb=sarcophagus + tomb=table: Tag:tomb=table tomb=tumulus: Tag:tomb=tumulus tomb=vault: Tag:tomb=vault tomb=war_grave: Tag:tomb=war grave @@ -9290,14 +10754,28 @@ en: tower:type=observation: Tag:tower:type=observation tower:type=radar: Tag:tower:type=radar tower:type=siren: Tag:tower:type=siren + tower:type=suspension: Tag:tower:type=suspension tower:type=watchtower: Tag:tower:type=watchtower + trade=wood: Tag:trade=wood traffic=local: Tag:traffic=local traffic=national: Tag:traffic=national traffic=regional: Tag:traffic=regional traffic=suburban: Tag:traffic=suburban traffic=urban: Tag:traffic=urban + traffic_calming=double_dip: Tag:traffic calming=double dip + traffic_calming=dynamic_bump: Tag:traffic calming=dynamic bump traffic_calming=island: Tag:traffic calming=island traffic_calming=table: Tag:traffic calming=table + traffic_sign:backward=DE:325.1: Tag:traffic sign:backward=DE:325.1 + traffic_sign:backward=DE:325.2: Tag:traffic sign:backward=DE:325.2 + traffic_sign:forward=DE:325.1: Tag:traffic sign:forward=DE:325.1 + traffic_sign:forward=DE:325.2: Tag:traffic sign:forward=DE:325.2 + traffic_sign=CH:2.59.3: Tag:traffic sign=CH:2.59.3 + traffic_sign=CH:2.59.5: Tag:traffic sign=CH:2.59.5 + traffic_sign=DE:1022-10: Tag:traffic sign=DE:1022-10 + traffic_sign=DE:124: Tag:traffic sign=DE:124 + traffic_sign=DE:136-10: Tag:traffic sign=DE:136-10 + traffic_sign=DE:142-10: Tag:traffic sign=DE:142-10 traffic_sign=DE:205: Tag:traffic sign=DE:205 traffic_sign=DE:206: Tag:traffic sign=DE:206 traffic_sign=DE:220-10: Tag:traffic sign=DE:220-10 @@ -9337,20 +10815,48 @@ en: traffic_sign=DE:274-70: Tag:traffic sign=DE:274-70 traffic_sign=DE:274-80: Tag:traffic sign=DE:274-80 traffic_sign=DE:274.1: Tag:traffic sign=DE:274.1 + traffic_sign=DE:274.1-20: Tag:traffic sign=DE:274.1-20 traffic_sign=DE:274.2: Tag:traffic sign=DE:274.2 + traffic_sign=DE:274.2-20: Tag:traffic sign=DE:274.2-20 traffic_sign=DE:282: Tag:traffic sign=DE:282 traffic_sign=DE:306: Tag:traffic sign=DE:306 + traffic_sign=DE:310: Tag:traffic sign=DE:310 traffic_sign=DE:325: Tag:traffic sign=DE:325 traffic_sign=DE:325.1: Tag:traffic sign=DE:325.1 traffic_sign=DE:325.2: Tag:traffic sign=DE:325.2 + traffic_sign=DE:330.1: Tag:traffic sign=DE:330.1 + traffic_sign=DE:330.2: Tag:traffic sign=DE:330.2 + traffic_sign=DE:331.1: Tag:traffic sign=DE:331.1 + traffic_sign=DE:331.2: Tag:traffic sign=DE:331.2 + traffic_sign=DE:350: Tag:traffic sign=DE:350 + traffic_sign=DE:350-10: Tag:traffic sign=DE:350-10 + traffic_sign=DE:350-20: Tag:traffic sign=DE:350-20 + traffic_sign=DE:350-40: Tag:traffic sign=DE:350-40 + traffic_sign=DE:354: Tag:traffic sign=DE:354 traffic_sign=DE:357: Tag:traffic sign=DE:357 + traffic_sign=DE:385: Tag:traffic sign=DE:385 traffic_sign=DE:386.3: Tag:traffic sign=DE:386.3 + traffic_sign=DE:394-50: Tag:traffic sign=DE:394-50 + traffic_sign=DE:437: Tag:traffic sign=DE:437 + traffic_sign=DE:438: Tag:traffic sign=DE:438 + traffic_sign=DE:439: Tag:traffic sign=DE:439 traffic_sign=DE:448: Tag:traffic sign=DE:448 traffic_sign=DE:449: Tag:traffic sign=DE:449 + traffic_sign=DE:453: Tag:traffic sign=DE:453 + traffic_sign=NL:A01-30-ZB: Tag:traffic sign=NL:A01-30-ZB + traffic_sign=NL:C15: Tag:traffic sign=NL:C15 + traffic_sign=NL:G07: Tag:traffic sign=NL:G07 + traffic_sign=NL:G11: Tag:traffic sign=NL:G11 + traffic_sign=NL:G12a: Tag:traffic sign=NL:G12a + traffic_sign=NL:G13: Tag:traffic sign=NL:G13 traffic_sign=city_limit: Tag:traffic sign=city limit traffic_sign=stop: Tag:traffic sign=stop + traffic_signals=tram_priority: Tag:traffic signals=tram priority trailer:type=motorcycle: Tag:trailer:type=motorcycle trailhead: Tag:trailhead + train=no: Tag:train=no + train=yes: Tag:train=yes + tram=yes: Tag:tram=yes transformer=auto: Tag:transformer=auto transformer=auxiliary: Tag:transformer=auxiliary transformer=converter: Tag:transformer=converter @@ -9359,13 +10865,29 @@ en: transformer=phase_angle_regulator: Tag:transformer=phase angle regulator transformer=traction: Tag:transformer=traction transformer=yes: Tag:transformer=yes + trees=almond_trees: Tag:trees=almond trees + trees=apple_trees: Tag:trees=apple trees + trees=banana_plants: Tag:trees=banana plants + trees=blueberry_plants: Tag:trees=blueberry plants + trees=cacao_trees: Tag:trees=cacao trees + trees=coconut_palms: Tag:trees=coconut palms + trees=coffea_plants: Tag:trees=coffea plants + trees=date_palms: Tag:trees=date palms + trees=hop_plants: Tag:trees=hop plants + trees=oil_palms: Tag:trees=oil palms + trees=olive_trees: Tag:trees=olive trees + trees=orange_trees: Tag:trees=orange trees + trees=papaya_trees: Tag:trees=papaya trees + trees=pineapple_plants: Tag:trees=pineapple plants + trees=tea_plants: Tag:trees=tea plants + tunnel=avalanche_protector: Tag:tunnel=avalanche protector + tunnel=building_passage: Tag:tunnel=building passage tunnel=culvert: Tag:tunnel=culvert tunnel=flooded: Tag:tunnel=flooded two_sided=yes: Tag:two sided=yes - type=AutoPASS: Tag:type=AutoPASS - type=autopass: Tag:type=autopass type=benchmark: Tag:type=benchmark type=boundary: Tag:type=boundary + type=destination_sign: Tag:type=destination sign type=enforcement: Tag:type=enforcement type=fixed_point: Tag:type=fixed point type=multipolygon: Tag:type=multipolygon @@ -9374,20 +10896,41 @@ en: type=restriction: Tag:type=restriction type=route: Tag:type=route type=site: Tag:type=site + type=superroute: Tag:type=superroute type=triangulation: Tag:type=triangulation type=waterway: Tag:type=waterway + usage=branch: Tag:usage=branch usage=distribution: Tag:usage=distribution usage=facility: Tag:usage=facility usage=flare_header: Tag:usage=flare header usage=flowline: Tag:usage=flowline usage=gathering: Tag:usage=gathering usage=headrace: Tag:usage=headrace + usage=industrial: Tag:usage=industrial usage=injection: Tag:usage=injection usage=irrigation: Tag:usage=irrigation + usage=main: Tag:usage=main + usage=military: Tag:usage=military usage=penstock: Tag:usage=penstock usage=spillway: Tag:usage=spillway usage=tailrace: Tag:usage=tailrace + usage=test: Tag:usage=test + usage=tourism: Tag:usage=tourism usage=transmission: Tag:usage=transmission + usage=transportation: Tag:usage=transportation + utility=chemical: Tag:utility=chemical + utility=gas: Tag:utility=gas + utility=heating: Tag:utility=heating + utility=hydrant: Tag:utility=hydrant + utility=oil: Tag:utility=oil + utility=power: Tag:utility=power + utility=sewerage: Tag:utility=sewerage + utility=street_lighting: Tag:utility=street lighting + utility=telecom: Tag:utility=telecom + utility=television: Tag:utility=television + utility=waste: Tag:utility=waste + utility=water: Tag:utility=water + valley=balka: Tag:valley=balka valve=ball: Tag:valve=ball valve=butterfly: Tag:valve=butterfly valve=gate: Tag:valve=gate @@ -9412,7 +10955,9 @@ en: vending=cigarettes: Tag:vending=cigarettes vending=coffee: Tag:vending=coffee vending=condoms: Tag:vending=condoms + vending=contact_lenses: Tag:vending=contact lenses vending=drinks: Tag:vending=drinks + vending=e-cigarettes: Tag:vending=e-cigarettes vending=electronics: Tag:vending=electronics vending=elongated_coin: Tag:vending=elongated coin vending=excrement_bags: Tag:vending=excrement bags @@ -9436,6 +10981,7 @@ en: vending=parking_tickets: Tag:vending=parking tickets vending=pet_food: Tag:vending=pet food vending=photo: Tag:vending=photo + vending=pizza: Tag:vending=pizza vending=public_transport_plans: Tag:vending=public transport plans vending=public_transport_tickets: Tag:vending=public transport tickets vending=raw_milk: Tag:vending=raw milk @@ -9455,21 +11001,31 @@ en: wall=no: Tag:wall=no wall=noise_barrier: Tag:wall=noise barrier wall=seawall: Tag:wall=seawall + wall=tire_barrier: Tag:wall=tire barrier wall=training_wall: Tag:wall=training wall waste=dog_excrement: Tag:waste=dog excrement + water=basin: Tag:water=basin water=canal: Tag:water=canal + water=ditch: Tag:water=ditch + water=drain: Tag:water=drain water=intermittent: Tag:water=intermittent water=lagoon: Tag:water=lagoon water=lake: Tag:water=lake water=lock: Tag:water=lock + water=moat: Tag:water=moat water=oxbow: Tag:water=oxbow water=pond: Tag:water=pond + water=reflecting_pool: Tag:water=reflecting pool water=reservoir: Tag:water=reservoir water=river: Tag:water=river + water=stream: Tag:water=stream + water=stream_pool: Tag:water=stream pool + water=swale: Tag:water=swale water=tidal: Tag:water=tidal water=wastewater: Tag:water=wastewater water_source=main: Tag:water source=main water_source=river: Tag:water source=river + waterway=artificial: Tag:waterway=artificial waterway=boat_lift: Tag:waterway=boat lift waterway=boatyard: Tag:waterway=boatyard waterway=brook: Tag:waterway=brook @@ -9485,6 +11041,7 @@ en: waterway=estuary: Tag:waterway=estuary waterway=fairway: Tag:waterway=fairway waterway=fish_pass: Tag:waterway=fish pass + waterway=floating_barrier: Tag:waterway=floating barrier waterway=fuel: Tag:waterway=fuel waterway=lock_gate: Tag:waterway=lock gate waterway=milestone: Tag:waterway=milestone @@ -9492,10 +11049,13 @@ en: waterway=offshore_field: Tag:waterway=offshore field waterway=portage: Tag:waterway=portage waterway=pressurised: Tag:waterway=pressurised + waterway=rapids: Tag:waterway=rapids waterway=river: Tag:waterway=river waterway=riverbank: Tag:waterway=riverbank + waterway=riverbed: Tag:waterway=riverbed waterway=sanitary_dump_station: Tag:waterway=sanitary dump station waterway=seaway: Tag:waterway=seaway + waterway=sluice_gate: Tag:waterway=sluice gate waterway=spillway: Tag:waterway=spillway waterway=stream: Tag:waterway=stream waterway=stream_end: Tag:waterway=stream end @@ -9521,6 +11081,7 @@ en: wood=eucalypt: Tag:wood=eucalypt wood=evergreen: Tag:wood=evergreen wood=nipa_palm: Tag:wood=nipa palm + worship=stations_of_the_cross: Tag:worship=stations of the cross zoo=aviary: Tag:zoo=aviary zoo=birds: Tag:zoo=birds zoo=butterfly: Tag:zoo=butterfly @@ -9531,8 +11092,6 @@ en: zoo=safari_park: Tag:zoo=safari park zoo=wildlife_park: Tag:zoo=wildlife park eo: - key: - esperanto: Eo:Key:esperanto tag: craft=tinsmith: Eo:Tag:craft=tinsmith esperanto=esperanto: Eo:Tag:esperanto=esperanto @@ -9541,13 +11100,16 @@ es: key: abandoned: ES:Key:abandoned 'abandoned:': 'ES:Key:abandoned:' + abandoned:place: ES:Key:abandoned:place abandoned:railway: ES:Key:abandoned:railway abutters: ES:Key:abutters + access: ES:Key:access addr: ES:Key:addr addr:city: ES:Key:addr:city addr:country: ES:Key:addr:country addr:district: ES:Key:addr:district addr:flats: ES:Key:addr:flats + addr:floor: ES:Key:addr:floor addr:full: ES:Key:addr:full addr:hamlet: ES:Key:addr:hamlet addr:housename: ES:Key:addr:housename @@ -9564,13 +11126,16 @@ es: admin_level: ES:Key:admin level aerialway: ES:Key:aerialway aeroway: ES:Key:aeroway + after_school: ES:Key:after school amenity: ES:Key:amenity + architect: ES:Key:architect area: ES:Key:area area:highway: ES:Key:area:highway artist_name: ES:Key:artist name artwork_subject: ES:Key:artwork subject artwork_type: ES:Key:artwork type barrier: ES:Key:barrier + beds: ES:Key:beds bicycle_parking: ES:Key:bicycle parking bicycle_road: ES:Key:bicycle road books: ES:Key:books @@ -9580,58 +11145,88 @@ es: bridge: ES:Key:bridge bridge:structure: ES:Key:bridge:structure building: ES:Key:building + building:fireproof: ES:Key:building:fireproof + building:flats: ES:Key:building:flats building:levels: ES:Key:building:levels + building:levels:underground: ES:Key:building:levels:underground building:material: ES:Key:building:material + building:min_level: ES:Key:building:min level building:part: ES:Key:building:part + building:soft_storey: ES:Key:building:soft storey + building:use: ES:Key:building:use bus_bay: ES:Key:bus bay busway: ES:Key:busway capital: ES:Key:capital cemetery: ES:Key:cemetery + changesets_count: ES:Key:changesets count check_date: ES:Key:check date circumference: ES:Key:circumference clothes: ES:Key:clothes club: ES:Key:club collection_times: ES:Key:collection times comment: ES:Key:comment + communication:amateur_radio: ES:Key:communication:amateur radio + communication:radio: ES:Key:communication:radio + communication:television: ES:Key:communication:television + community_centre: ES:Key:community centre + community_centre:for: ES:Key:community centre:for construction: ES:Key:construction + consulting: ES:Key:consulting contact: ES:Key:contact contact:facebook: ES:Key:contact:facebook contact:twitter: ES:Key:contact:twitter content: ES:Key:content conveying: ES:Key:conveying + covered: ES:Key:covered craft: ES:Key:craft created_by: ES:Key:created by + crop: ES:Key:crop crossing: ES:Key:crossing crossing:island: ES:Key:crossing:island cuisine: ES:Key:cuisine + currency: ES:Key:currency cutting: ES:Key:cutting cycleway: ES:Key:cycleway + cycleway:both: ES:Key:cycleway:both + cycleway:lane: ES:Key:cycleway:lane cycleway:left: ES:Key:cycleway:left cycleway:right: ES:Key:cycleway:right + delivery: ES:Key:delivery denotation: ES:Key:denotation description: ES:Key:description destination: ES:Key:destination diaper: ES:Key:diaper diet: ES:Key:diet diet:*: ES:Key:diet:* + diet:kosher: ES:Key:diet:kosher + dispensing: ES:Key:dispensing + distance: ES:Key:distance disused: ES:Key:disused 'disused:': 'ES:Key:disused:' disused:railway: ES:Key:disused:railway + email: ES:Key:email embankment: ES:Key:embankment emergency: ES:Key:emergency end_date: ES:Key:end date + engineer: ES:Key:engineer entrance: ES:Key:entrance evacuation_route: ES:Key:evacuation route facebook: ES:Key:facebook fair_trade: ES:Key:fair trade fee: ES:Key:fee fence_type: ES:Key:fence type + fishing: ES:Key:fishing fixme: ES:Key:fixme + flood_prone: ES:Key:flood prone + foot: ES:Key:foot + foot:backward: ES:Key:foot:backward footway: ES:Key:footway ford: ES:Key:ford + from: ES:Key:from fuel:diesel_G2: ES:Key:fuel:diesel G2 garden:style: ES:Key:garden:style garden:type: ES:Key:garden:type + gauge: ES:Key:gauge generator:output: ES:Key:generator:output generator:source: ES:Key:generator:source genus: ES:Key:genus @@ -9639,6 +11234,8 @@ es: government: ES:Key:government grassland: ES:Key:grassland hazard_prone: ES:Key:hazard prone + healthcare: ES:Key:healthcare + healthcare:counselling: ES:Key:healthcare:counselling height: ES:Key:height heritage: ES:Key:heritage highway: ES:Key:highway @@ -9649,26 +11246,34 @@ es: incline: ES:Key:incline indoor: ES:Key:indoor industrial: ES:Key:industrial + informal: ES:Key:informal information: ES:Key:information inscription: ES:Key:inscription intermittent: ES:Key:intermittent interval: ES:Key:interval + irrigated: ES:Key:irrigated is_in: ES:Key:is in + is_in:continent: ES:Key:is in:continent is_in:country: ES:Key:is in:country + isced:level: ES:Key:isced:level kerb: ES:Key:kerb ladder: ES:Key:ladder landuse: ES:Key:landuse + lane_markings: ES:Key:lane markings lanes: ES:Key:lanes lanes:psv: ES:Key:lanes:psv + lawyer: ES:Key:lawyer leaf_cycle: ES:Key:leaf cycle leaf_type: ES:Key:leaf type leisure: ES:Key:leisure + length: ES:Key:length level: ES:Key:level lgbtq: ES:Key:lgbtq local_ref: ES:Key:local ref locale: ES:Key:locale location: ES:Key:location man_made: ES:Key:man made + manhole: ES:Key:manhole manufacturer: ES:Key:manufacturer mapillary: ES:Key:mapillary material: ES:Key:material @@ -9677,21 +11282,42 @@ es: maxspeed:advisory: ES:Key:maxspeed:advisory maxspeed:practical: ES:Key:maxspeed:practical memorial: ES:Key:memorial + min_height: ES:Key:min height monitoring:galileo: ES:Key:monitoring:galileo monitoring:glonass: ES:Key:monitoring:glonass monitoring:gps: ES:Key:monitoring:gps + motorcycle:clothes: ES:Key:motorcycle:clothes + motorcycle:parts: ES:Key:motorcycle:parts + motorcycle:rental: ES:Key:motorcycle:rental + motorcycle:repair: ES:Key:motorcycle:repair + motorcycle:sales: ES:Key:motorcycle:sales + motorcycle:type: ES:Key:motorcycle:type + motorcycle:tyres: ES:Key:motorcycle:tyres motorhome: ES:Key:motorhome motorroad: ES:Key:motorroad mountain_pass: ES:Key:mountain pass + museum: ES:Key:museum + museum_type: ES:Key:museum type + musical_instrument: ES:Key:musical instrument name: ES:Key:name + narrow: ES:Key:narrow natural: ES:Key:natural + network:type: ES:Key:network:type + noaddress: ES:Key:noaddress noexit: ES:Key:noexit + nohousenumber: ES:Key:nohousenumber + non_existent_levels: ES:Key:non existent levels noname: ES:Key:noname + 'not:': 'ES:Key:not:' note: ES:Key:note + nudism: ES:Key:nudism + object: ES:Key:object office: ES:Key:office + old_name: ES:Key:old name oneway: ES:Key:oneway oneway:psv: ES:Key:oneway:psv opening_hours: ES:Key:opening hours + opening_hours:covid19: ES:Key:opening hours:covid19 operator: ES:Key:operator operator:type: ES:Key:operator:type organic: ES:Key:organic @@ -9700,6 +11326,7 @@ es: osmc:symbol: ES:Key:osmc:symbol overtaking: ES:Key:overtaking owner: ES:Key:owner + ownership: ES:Key:ownership parking: ES:Key:parking parking:lane: ES:Key:parking:lane passenger: ES:Key:passenger @@ -9714,8 +11341,11 @@ es: prepayment:*: ES:Key:prepayment:* priority: ES:Key:priority priority_road: ES:Key:priority road + produce: ES:Key:produce product: ES:Key:product proposed: ES:Key:proposed + protect_class: ES:Key:protect class + protection_title: ES:Key:protection title psv: ES:Key:psv public_bookcase:type: ES:Key:public bookcase:type public_transport: ES:Key:public transport @@ -9729,11 +11359,18 @@ es: ref:color: ES:Key:ref:color ref:colour: ES:Key:ref:colour ref:isil: ES:Key:ref:isil + related_law: ES:Key:related law religion: ES:Key:religion 'removed:': 'ES:Key:removed:' + reservation: ES:Key:reservation + residential: ES:Key:residential resource: ES:Key:resource + review_requested: ES:Key:review requested + roller_coaster: ES:Key:roller coaster + roof:colour: ES:Key:roof:colour roof:direction: ES:Key:roof:direction roof:material: ES:Key:roof:material + roof:shape: ES:Key:roof:shape roundtrip: ES:Key:roundtrip route: ES:Key:route route_master: ES:Key:route master @@ -9744,14 +11381,20 @@ es: sac_scale: ES:Key:sac scale safety_rope: ES:Key:safety rope seasonal: ES:Key:seasonal + seats: ES:Key:seats + service:bicycle:diy: ES:Key:service:bicycle:diy + shelter: ES:Key:shelter shop: ES:Key:shop + shoulder: ES:Key:shoulder sidewalk: ES:Key:sidewalk site_type: ES:Key:site type social_facility: ES:Key:social facility + social_facility:for: ES:Key:social facility:for source: ES:Key:source species: ES:Key:species sport: ES:Key:sport stars: ES:Key:stars + start_date: ES:Key:start date stop: ES:Key:stop supervised: ES:Key:supervised support: ES:Key:support @@ -9762,14 +11405,22 @@ es: symbol: ES:Key:symbol takeaway: ES:Key:takeaway taxi: ES:Key:taxi + tents: ES:Key:tents + theatre:type: ES:Key:theatre:type + to: ES:Key:to todo: ES:Key:todo + toilets: ES:Key:toilets + toilets:wheelchair: ES:Key:toilets:wheelchair tourism: ES:Key:tourism + tourist_bus: ES:Key:tourist bus + tower:construction: ES:Key:tower:construction tracktype: ES:Key:tracktype traffic: ES:Key:traffic traffic_calming: ES:Key:traffic calming traffic_sign: ES:Key:traffic sign traffic_signals: ES:Key:traffic signals traffic_signals:direction: ES:Key:traffic signals:direction + tree_lined: ES:Key:tree lined trolley_wire: ES:Key:trolley wire trolleybus: ES:Key:trolleybus tunnel: ES:Key:tunnel @@ -9778,10 +11429,15 @@ es: type: ES:Key:type unnamed: ES:Key:unnamed url: ES:Key:url + vaccination: ES:Key:vaccination + vehicle: ES:Key:vehicle + via: ES:Key:via water: ES:Key:water waterway: ES:Key:waterway website: ES:Key:website + wetland: ES:Key:wetland wheelchair: ES:Key:wheelchair + wheelchair:description: ES:Key:wheelchair:description wholesale: ES:Key:wholesale wikidata: ES:Key:wikidata wikimedia_commons: ES:Key:wikimedia commons @@ -9789,17 +11445,27 @@ es: tag: abandoned:amenity=prison_camp: ES:Tag:abandoned:amenity=prison camp access=customers: ES:Tag:access=customers + access=private: ES:Tag:access=private + admin_level=2: ES:Tag:admin level=2 advertising=board: ES:Tag:advertising=board advertising=column: ES:Tag:advertising=column advertising=totem: ES:Tag:advertising=totem + advertising=wall_painting: ES:Tag:advertising=wall painting aerialway=cable_car: ES:Tag:aerialway=cable car aerialway=gondola: ES:Tag:aerialway=gondola + aerialway=pylon: ES:Tag:aerialway=pylon aerialway=station: ES:Tag:aerialway=station aerodrome:type=regional: ES:Tag:aerodrome:type=regional + aeroway=aerodrome: ES:Tag:aeroway=aerodrome aeroway=apron: ES:Tag:aeroway=apron + aeroway=gate: ES:Tag:aeroway=gate + aeroway=hangar: ES:Tag:aeroway=hangar aeroway=helipad: ES:Tag:aeroway=helipad aeroway=heliport: ES:Tag:aeroway=heliport + aeroway=holding_position: ES:Tag:aeroway=holding position aeroway=navigationaid: ES:Tag:aeroway=navigationaid + aeroway=runway: ES:Tag:aeroway=runway + aeroway=taxiway: ES:Tag:aeroway=taxiway aeroway=terminal: ES:Tag:aeroway=terminal aeroway=windsock: ES:Tag:aeroway=windsock airmark=beacon: ES:Tag:airmark=beacon @@ -9807,10 +11473,12 @@ es: amenity=archive: ES:Tag:amenity=archive amenity=arts_centre: ES:Tag:amenity=arts centre amenity=atm: ES:Tag:amenity=atm + amenity=baking_oven: ES:Tag:amenity=baking oven amenity=bank: ES:Tag:amenity=bank amenity=bar: ES:Tag:amenity=bar amenity=bbq: ES:Tag:amenity=bbq amenity=bench: ES:Tag:amenity=bench + amenity=bicycle_library: ES:Tag:amenity=bicycle library amenity=bicycle_parking: ES:Tag:amenity=bicycle parking amenity=bicycle_rental: ES:Tag:amenity=bicycle rental amenity=biergarten: ES:Tag:amenity=biergarten @@ -9820,6 +11488,7 @@ es: amenity=cafe: ES:Tag:amenity=cafe amenity=car_rental: ES:Tag:amenity=car rental amenity=car_wash: ES:Tag:amenity=car wash + amenity=childcare: ES:Tag:amenity=childcare amenity=clinic: ES:Tag:amenity=clinic amenity=clock: ES:Tag:amenity=clock amenity=college: ES:Tag:amenity=college @@ -9830,6 +11499,7 @@ es: amenity=coworking_space: ES:Tag:amenity=coworking space amenity=crematorium: ES:Tag:amenity=crematorium amenity=crypt: ES:Tag:amenity=crypt + amenity=dancing_school: ES:Tag:amenity=dancing school amenity=dentist: ES:Tag:amenity=dentist amenity=device_charging_station: ES:Tag:amenity=device charging station amenity=doctors: ES:Tag:amenity=doctors @@ -9840,23 +11510,34 @@ es: amenity=exhibition_centre: ES:Tag:amenity=exhibition centre amenity=fast_food: ES:Tag:amenity=fast food amenity=ferry_terminal: ES:Tag:amenity=ferry terminal + amenity=fire_station: ES:Tag:amenity=fire station amenity=food_court: ES:Tag:amenity=food court amenity=fountain: ES:Tag:amenity=fountain amenity=fuel: ES:Tag:amenity=fuel + amenity=funeral_hall: ES:Tag:amenity=funeral hall + amenity=gambling: ES:Tag:amenity=gambling + amenity=give_box: ES:Tag:amenity=give box amenity=grave_yard: ES:Tag:amenity=grave yard + amenity=harbourmaster: ES:Tag:amenity=harbourmaster amenity=hospital: ES:Tag:amenity=hospital amenity=ice_cream: ES:Tag:amenity=ice cream amenity=internet_cafe: ES:Tag:amenity=internet cafe + amenity=jobcentre: ES:Tag:amenity=jobcentre + amenity=karaoke_box: ES:Tag:amenity=karaoke box amenity=kindergarten: ES:Tag:amenity=kindergarten amenity=language_school: ES:Tag:amenity=language school amenity=lavoir: ES:Tag:amenity=lavoir + amenity=letter_box: ES:Tag:amenity=letter box amenity=library: ES:Tag:amenity=library + amenity=lounger: ES:Tag:amenity=lounger amenity=love_hotel: ES:Tag:amenity=love hotel amenity=marketplace: ES:Tag:amenity=marketplace amenity=mobile_library: ES:Tag:amenity=mobile library amenity=mortuary: ES:Tag:amenity=mortuary + amenity=motorcycle_parking: ES:Tag:amenity=motorcycle parking amenity=music_school: ES:Tag:amenity=music school amenity=nightclub: ES:Tag:amenity=nightclub + amenity=nursing_home: ES:Tag:amenity=nursing home amenity=parking: ES:Tag:amenity=parking amenity=parking_entrance: ES:Tag:amenity=parking entrance amenity=parking_space: ES:Tag:amenity=parking space @@ -9867,6 +11548,10 @@ es: amenity=place_of_worship: ES:Tag:amenity=place of worship amenity=planetarium: ES:Tag:amenity=planetarium amenity=police: ES:Tag:amenity=police + amenity=post_box: ES:Tag:amenity=post box + amenity=post_depot: ES:Tag:amenity=post depot + amenity=post_office: ES:Tag:amenity=post office + amenity=prep_school: ES:Tag:amenity=prep school amenity=prison_camp: ES:Tag:amenity=prison camp amenity=pub: ES:Tag:amenity=pub amenity=public_bookcase: ES:Tag:amenity=public bookcase @@ -9875,14 +11560,24 @@ es: amenity=refugee_housing: ES:Tag:amenity=refugee housing amenity=research_institute: ES:Tag:amenity=research institute amenity=restaurant: ES:Tag:amenity=restaurant + amenity=retirement_home: ES:Tag:amenity=retirement home amenity=school: ES:Tag:amenity=school + amenity=seat: ES:Tag:amenity=seat amenity=shelter: ES:Tag:amenity=shelter amenity=shower: ES:Tag:amenity=shower + amenity=ski_school: ES:Tag:amenity=ski school + amenity=social_centre: ES:Tag:amenity=social centre amenity=social_facility: ES:Tag:amenity=social facility + amenity=sport_school: ES:Tag:amenity=sport school + amenity=stool: ES:Tag:amenity=stool amenity=stripclub: ES:Tag:amenity=stripclub + amenity=studio: ES:Tag:amenity=studio amenity=taxi: ES:Tag:amenity=taxi + amenity=television: ES:Tag:amenity=television amenity=theatre: ES:Tag:amenity=theatre + amenity=tourist_bus_parking: ES:Tag:amenity=tourist bus parking amenity=townhall: ES:Tag:amenity=townhall + amenity=toy_library: ES:Tag:amenity=toy library amenity=university: ES:Tag:amenity=university amenity=vehicle_inspection: ES:Tag:amenity=vehicle inspection amenity=vending_machine: ES:Tag:amenity=vending machine @@ -9899,9 +11594,11 @@ es: area:highway=footway: ES:Tag:area:highway=footway area:highway=path: ES:Tag:area:highway=path area:highway=pedestrian: ES:Tag:area:highway=pedestrian + attraction=roller_coaster: ES:Tag:attraction=roller coaster attraction=water_slide: ES:Tag:attraction=water slide barrier=block: ES:Tag:barrier=block barrier=bollard: ES:Tag:barrier=bollard + barrier=border_control: ES:Tag:barrier=border control barrier=cable_barrier: ES:Tag:barrier=cable barrier barrier=chain: ES:Tag:barrier=chain barrier=city_wall: ES:Tag:barrier=city wall @@ -9910,6 +11607,7 @@ es: barrier=fence: ES:Tag:barrier=fence barrier=gate: ES:Tag:barrier=gate barrier=guard_rail: ES:Tag:barrier=guard rail + barrier=handrail: ES:Tag:barrier=handrail barrier=hedge: ES:Tag:barrier=hedge barrier=height_restrictor: ES:Tag:barrier=height restrictor barrier=jersey_barrier: ES:Tag:barrier=jersey barrier @@ -9917,11 +11615,14 @@ es: barrier=lift_gate: ES:Tag:barrier=lift gate barrier=retaining_wall: ES:Tag:barrier=retaining wall barrier=rope: ES:Tag:barrier=rope + barrier=sally_port: ES:Tag:barrier=sally port barrier=spikes: ES:Tag:barrier=spikes barrier=swing_gate: ES:Tag:barrier=swing gate barrier=toll_booth: ES:Tag:barrier=toll booth + barrier=tyres: ES:Tag:barrier=tyres barrier=wall: ES:Tag:barrier=wall bicycle=use_sidepath: ES:Tag:bicycle=use sidepath + boundary=administrative: ES:Tag:boundary=administrative boundary=national_park: ES:Tag:boundary=national park boundary=political: ES:Tag:boundary=political boundary=protected_area: ES:Tag:boundary=protected area @@ -9929,47 +11630,87 @@ es: bridge=aqueduct: ES:Tag:bridge=aqueduct bridge=viaduct: ES:Tag:bridge=viaduct building=apartments: ES:Tag:building=apartments + building=bakehouse: ES:Tag:building=bakehouse building=barn: ES:Tag:building=barn building=boathouse: ES:Tag:building=boathouse building=brewery: ES:Tag:building=brewery + building=bridge: ES:Tag:building=bridge building=bungalow: ES:Tag:building=bungalow + building=bunker: ES:Tag:building=bunker + building=cabin: ES:Tag:building=cabin building=carport: ES:Tag:building=carport building=cathedral: ES:Tag:building=cathedral building=chapel: ES:Tag:building=chapel building=church: ES:Tag:building=church building=civic: ES:Tag:building=civic + building=college: ES:Tag:building=college building=commercial: ES:Tag:building=commercial building=conservatory: ES:Tag:building=conservatory building=construction: ES:Tag:building=construction building=container: ES:Tag:building=container + building=cowshed: ES:Tag:building=cowshed building=detached: ES:Tag:building=detached + building=digester: ES:Tag:building=digester building=dormitory: ES:Tag:building=dormitory building=farm: ES:Tag:building=farm + building=farm_auxiliary: ES:Tag:building=farm auxiliary + building=fire_station: ES:Tag:building=fire station building=garage: ES:Tag:building=garage building=garages: ES:Tag:building=garages + building=gatehouse: ES:Tag:building=gatehouse + building=ger: ES:Tag:building=ger + building=government: ES:Tag:building=government building=grandstand: ES:Tag:building=grandstand building=greenhouse: ES:Tag:building=greenhouse + building=hangar: ES:Tag:building=hangar building=hospital: ES:Tag:building=hospital + building=hotel: ES:Tag:building=hotel building=house: ES:Tag:building=house building=houseboat: ES:Tag:building=houseboat building=hut: ES:Tag:building=hut building=industrial: ES:Tag:building=industrial + building=kindergarten: ES:Tag:building=kindergarten building=kiosk: ES:Tag:building=kiosk + building=monastery: ES:Tag:building=monastery + building=mosque: ES:Tag:building=mosque building=office: ES:Tag:building=office + building=parking: ES:Tag:building=parking + building=pavilion: ES:Tag:building=pavilion building=public: ES:Tag:building=public + building=religious: ES:Tag:building=religious building=residential: ES:Tag:building=residential building=retail: ES:Tag:building=retail + building=riding_hall: ES:Tag:building=riding hall building=roof: ES:Tag:building=roof building=ruins: ES:Tag:building=ruins building=school: ES:Tag:building=school + building=semi: ES:Tag:building=semi + building=semidetached_house: ES:Tag:building=semidetached house building=service: ES:Tag:building=service building=shed: ES:Tag:building=shed + building=shrine: ES:Tag:building=shrine + building=slurry_tank: ES:Tag:building=slurry tank building=sports_hall: ES:Tag:building=sports hall + building=stable: ES:Tag:building=stable + building=stadium: ES:Tag:building=stadium + building=static_caravan: ES:Tag:building=static caravan building=sty: ES:Tag:building=sty + building=supermarket: ES:Tag:building=supermarket + building=synagogue: ES:Tag:building=synagogue + building=temple: ES:Tag:building=temple + building=tent: ES:Tag:building=tent building=terrace: ES:Tag:building=terrace + building=toilets: ES:Tag:building=toilets + building=train_station: ES:Tag:building=train station + building=transformer_tower: ES:Tag:building=transformer tower + building=transportation: ES:Tag:building=transportation + building=tree_house: ES:Tag:building=tree house building=university: ES:Tag:building=university building=warehouse: ES:Tag:building=warehouse + building=water_tower: ES:Tag:building=water tower + castle_type=manor: ES:Tag:castle type=manor cemetery=grave: ES:Tag:cemetery=grave + clothes=fashion: ES:Tag:clothes=fashion club=scout: ES:Tag:club=scout club=sport: ES:Tag:club=sport craft=agricultural_engines: ES:Tag:craft=agricultural engines @@ -9992,33 +11733,50 @@ es: craft=electronics_repair: ES:Tag:craft=electronics repair craft=engraver: ES:Tag:craft=engraver craft=gardener: ES:Tag:craft=gardener + craft=glaziery: ES:Tag:craft=glaziery craft=handicraft: ES:Tag:craft=handicraft craft=hvac: ES:Tag:craft=hvac + craft=information_electronics: ES:Tag:craft=information electronics craft=jeweller: ES:Tag:craft=jeweller + craft=luthier: ES:Tag:craft=luthier + craft=metal_construction: ES:Tag:craft=metal construction + craft=musical_instrument: ES:Tag:craft=musical instrument craft=oil_mill: ES:Tag:craft=oil mill craft=optician: ES:Tag:craft=optician craft=photographer: ES:Tag:craft=photographer craft=plumber: ES:Tag:craft=plumber craft=pottery: ES:Tag:craft=pottery + craft=printer: ES:Tag:craft=printer + craft=shoemaker: ES:Tag:craft=shoemaker craft=tailor: ES:Tag:craft=tailor craft=tiler: ES:Tag:craft=tiler craft=upholsterer: ES:Tag:craft=upholsterer craft=watchmaker: ES:Tag:craft=watchmaker + crossing=marked: ES:Tag:crossing=marked + crossing=traffic_signals: ES:Tag:crossing=traffic signals crossing=zebra: ES:Tag:crossing=zebra + cycleway:right=lane: ES:Tag:cycleway:right=lane + cycleway:right=track: ES:Tag:cycleway:right=track cycleway=lane: ES:Tag:cycleway=lane + cycleway=opposite_lane: ES:Tag:cycleway=opposite lane + cycleway=opposite_track: ES:Tag:cycleway=opposite track cycleway=share_busway: ES:Tag:cycleway=share busway cycleway=track: ES:Tag:cycleway=track emergency=ambulance_station: ES:Tag:emergency=ambulance station emergency=defibrillator: ES:Tag:emergency=defibrillator emergency=dry_riser: ES:Tag:emergency=dry riser + emergency=emergency_ward_entrance: ES:Tag:emergency=emergency ward entrance emergency=fire_extinguisher: ES:Tag:emergency=fire extinguisher + emergency=fire_hose: ES:Tag:emergency=fire hose emergency=fire_hydrant: ES:Tag:emergency=fire hydrant emergency=landing_site: ES:Tag:emergency=landing site emergency=phone: ES:Tag:emergency=phone emergency=ses_station: ES:Tag:emergency=ses station + emergency=yes: ES:Tag:emergency=yes flow_direction=both: ES:Tag:flow direction=both footway=crossing: ES:Tag:footway=crossing footway=sidewalk: ES:Tag:footway=sidewalk + ford=stepping_stones: ES:Tag:ford=stepping stones ford=yes: ES:Tag:ford=yes garden:type=botanical: ES:Tag:garden:type=botanical generator:method=photovoltaic: ES:Tag:generator:method=photovoltaic @@ -10035,7 +11793,37 @@ es: geological=moraine: ES:Tag:geological=moraine geological=outcrop: ES:Tag:geological=outcrop geological=palaeontological_site: ES:Tag:geological=palaeontological site + golf=bunker: ES:Tag:golf=bunker + golf=clubhouse: ES:Tag:golf=clubhouse + golf=driving_range: ES:Tag:golf=driving range + golf=fairway: ES:Tag:golf=fairway + golf=green: ES:Tag:golf=green + golf=hole: ES:Tag:golf=hole + golf=rough: ES:Tag:golf=rough + golf=tee: ES:Tag:golf=tee + golf=water_hazard: ES:Tag:golf=water hazard + government=administrative: ES:Tag:government=administrative + government=audit: ES:Tag:government=audit + government=border_control: ES:Tag:government=border control + government=cadaster: ES:Tag:government=cadaster + government=customs: ES:Tag:government=customs + government=data_protection: ES:Tag:government=data protection + government=healthcare: ES:Tag:government=healthcare + government=legislative: ES:Tag:government=legislative + government=ministry: ES:Tag:government=ministry + government=parliament: ES:Tag:government=parliament + government=prosecutor: ES:Tag:government=prosecutor government=register_office: ES:Tag:government=register office + government=statistics: ES:Tag:government=statistics + government=tax: ES:Tag:government=tax + government=youth_welfare_department: ES:Tag:government=youth welfare department + healthcare:speciality=vaccination: ES:Tag:healthcare:speciality=vaccination + healthcare=birthing_center: ES:Tag:healthcare=birthing center + healthcare=doctor: ES:Tag:healthcare=doctor + healthcare=hospital: ES:Tag:healthcare=hospital + healthcare=laboratory: ES:Tag:healthcare=laboratory + healthcare=midwife: ES:Tag:healthcare=midwife + healthcare=podiatrist: ES:Tag:healthcare=podiatrist highway=bridleway: ES:Tag:highway=bridleway highway=bus_guideway: ES:Tag:highway=bus guideway highway=bus_stop: ES:Tag:highway=bus stop @@ -10044,6 +11832,7 @@ es: highway=crossing: ES:Tag:highway=crossing highway=cycleway: ES:Tag:highway=cycleway highway=elevator: ES:Tag:highway=elevator + highway=emergency_access_point: ES:Tag:highway=emergency access point highway=escape: ES:Tag:highway=escape highway=footway: ES:Tag:highway=footway highway=living_street: ES:Tag:highway=living street @@ -10055,12 +11844,17 @@ es: highway=pedestrian: ES:Tag:highway=pedestrian highway=platform: ES:Tag:highway=platform highway=primary: ES:Tag:highway=primary + highway=primary_link: ES:Tag:highway=primary link + highway=proposed: ES:Tag:highway=proposed highway=raceway: ES:Tag:highway=raceway highway=razed: ES:Tag:highway=razed highway=residential: ES:Tag:highway=residential + highway=rest_area: ES:Tag:highway=rest area highway=road: ES:Tag:highway=road highway=secondary: ES:Tag:highway=secondary + highway=secondary_link: ES:Tag:highway=secondary link highway=service: ES:Tag:highway=service + highway=speed_camera: ES:Tag:highway=speed camera highway=speed_display: ES:Tag:highway=speed display highway=steps: ES:Tag:highway=steps highway=stop: ES:Tag:highway=stop @@ -10068,6 +11862,7 @@ es: highway=tertiary: ES:Tag:highway=tertiary highway=track: ES:Tag:highway=track highway=traffic_signals: ES:Tag:highway=traffic signals + highway=trailhead: ES:Tag:highway=trailhead highway=trunk: ES:Tag:highway=trunk highway=turning_circle: ES:Tag:highway=turning circle highway=turning_loop: ES:Tag:highway=turning loop @@ -10075,22 +11870,30 @@ es: historic=aqueduct: ES:Tag:historic=aqueduct historic=archaeological_site: ES:Tag:historic=archaeological site historic=boundary_stone: ES:Tag:historic=boundary stone + historic=district: ES:Tag:historic=district historic=farm: ES:Tag:historic=farm historic=heritage: ES:Tag:historic=heritage + historic=manor: ES:Tag:historic=manor historic=memorial: ES:Tag:historic=memorial historic=milestone: ES:Tag:historic=milestone + historic=mine: ES:Tag:historic=mine historic=pillory: ES:Tag:historic=pillory historic=ruins: ES:Tag:historic=ruins historic=tomb: ES:Tag:historic=tomb + historic=wayside_cross: ES:Tag:historic=wayside cross historic=wayside_shrine: ES:Tag:historic=wayside shrine historic=wreck: ES:Tag:historic=wreck industrial=auto_wrecker: ES:Tag:industrial=auto wrecker + industrial=depot: ES:Tag:industrial=depot industrial=factory: ES:Tag:industrial=factory industrial=scrap_yard: ES:Tag:industrial=scrap yard + industrial=warehouse: ES:Tag:industrial=warehouse information=board: ES:Tag:information=board information=guidepost: ES:Tag:information=guidepost information=map: ES:Tag:information=map + information=office: ES:Tag:information=office information=tactile_map: ES:Tag:information=tactile map + information=visitor_centre: ES:Tag:information=visitor centre internet_access=wlan: ES:Tag:internet access=wlan junction=circular: ES:Tag:junction=circular junction=roundabout: ES:Tag:junction=roundabout @@ -10103,6 +11906,7 @@ es: landuse=basin: ES:Tag:landuse=basin landuse=brownfield: ES:Tag:landuse=brownfield landuse=cemetery: ES:Tag:landuse=cemetery + landuse=commercial: ES:Tag:landuse=commercial landuse=construction: ES:Tag:landuse=construction landuse=depot: ES:Tag:landuse=depot landuse=farmland: ES:Tag:landuse=farmland @@ -10115,7 +11919,9 @@ es: landuse=industrial: ES:Tag:landuse=industrial landuse=landfill: ES:Tag:landuse=landfill landuse=meadow: ES:Tag:landuse=meadow + landuse=meadow_orchard: ES:Tag:landuse=meadow orchard landuse=orchard: ES:Tag:landuse=orchard + landuse=plant_nursery: ES:Tag:landuse=plant nursery landuse=quarry: ES:Tag:landuse=quarry landuse=recreation_ground: ES:Tag:landuse=recreation ground landuse=reservoir: ES:Tag:landuse=reservoir @@ -10138,22 +11944,31 @@ es: leisure=bleachers: ES:Tag:leisure=bleachers leisure=bowling_alley: ES:Tag:leisure=bowling alley leisure=common: ES:Tag:leisure=common + leisure=disc_golf_course: ES:Tag:leisure=disc golf course leisure=dog_park: ES:Tag:leisure=dog park + leisure=escape_game: ES:Tag:leisure=escape game leisure=firepit: ES:Tag:leisure=firepit + leisure=fishing: ES:Tag:leisure=fishing leisure=fitness_centre: ES:Tag:leisure=fitness centre leisure=fitness_station: ES:Tag:leisure=fitness station leisure=garden: ES:Tag:leisure=garden leisure=golf_course: ES:Tag:leisure=golf course + leisure=hackerspace: ES:Tag:leisure=hackerspace leisure=horse_riding: ES:Tag:leisure=horse riding leisure=marina: ES:Tag:leisure=marina leisure=miniature_golf: ES:Tag:leisure=miniature golf leisure=nature_reserve: ES:Tag:leisure=nature reserve + leisure=outdoor_seating: ES:Tag:leisure=outdoor seating leisure=park: ES:Tag:leisure=park leisure=picnic_table: ES:Tag:leisure=picnic table leisure=pitch: ES:Tag:leisure=pitch leisure=playground: ES:Tag:leisure=playground + leisure=sauna: ES:Tag:leisure=sauna + leisure=schoolyard: ES:Tag:leisure=schoolyard + leisure=slipway: ES:Tag:leisure=slipway leisure=sports_centre: ES:Tag:leisure=sports centre leisure=sports_hall: ES:Tag:leisure=sports hall + leisure=stadium: ES:Tag:leisure=stadium leisure=swimming_pool: ES:Tag:leisure=swimming pool leisure=tanning_salon: ES:Tag:leisure=tanning salon leisure=track: ES:Tag:leisure=track @@ -10164,12 +11979,16 @@ es: man_made=breakwater: ES:Tag:man made=breakwater man_made=bridge: ES:Tag:man made=bridge man_made=chimney: ES:Tag:man made=chimney + man_made=clearcut: ES:Tag:man made=clearcut + man_made=compass_rose: ES:Tag:man made=compass rose man_made=cross: ES:Tag:man made=cross man_made=cutline: ES:Tag:man made=cutline man_made=drinking_fountain: ES:Tag:man made=drinking fountain man_made=dyke: ES:Tag:man made=dyke man_made=embankment: ES:Tag:man made=embankment man_made=flagpole: ES:Tag:man made=flagpole + man_made=gantry: ES:Tag:man made=gantry + man_made=geoglyph: ES:Tag:man made=geoglyph man_made=mast: ES:Tag:man made=mast man_made=monitoring_station: ES:Tag:man made=monitoring station man_made=nesting_site: ES:Tag:man made=nesting site @@ -10181,6 +12000,7 @@ es: man_made=pumping_station: ES:Tag:man made=pumping station man_made=reservoir_covered: ES:Tag:man made=reservoir covered man_made=storage_tank: ES:Tag:man made=storage tank + man_made=street_cabinet: ES:Tag:man made=street cabinet man_made=surveillance: ES:Tag:man made=surveillance man_made=survey_point: ES:Tag:man made=survey point man_made=telescope: ES:Tag:man made=telescope @@ -10194,9 +12014,11 @@ es: man_made=watermill: ES:Tag:man made=watermill man_made=wildlife_opening: ES:Tag:man made=wildlife opening man_made=windpump: ES:Tag:man made=windpump + man_made=works: ES:Tag:man made=works manhole=drain: ES:Tag:manhole=drain memorial=blue_plaque: ES:Tag:memorial=blue plaque memorial=bust: ES:Tag:memorial=bust + memorial=cross: ES:Tag:memorial=cross memorial=ghost_bike: ES:Tag:memorial=ghost bike memorial=obelisk: ES:Tag:memorial=obelisk memorial=plaque: ES:Tag:memorial=plaque @@ -10208,6 +12030,7 @@ es: military=naval_base: ES:Tag:military=naval base military=training_area: ES:Tag:military=training area name=Dollarama: ES:Tag:name=Dollarama + name=Herfy: ES:Tag:name=Herfy natural=arete: ES:Tag:natural=arete natural=avalanche_dam: ES:Tag:natural=avalanche dam natural=bare_rock: ES:Tag:natural=bare rock @@ -10218,6 +12041,7 @@ es: natural=cliff: ES:Tag:natural=cliff natural=coastline: ES:Tag:natural=coastline natural=desert: ES:Tag:natural=desert + natural=earth_bank: ES:Tag:natural=earth bank natural=esker: ES:Tag:natural=esker natural=fell: ES:Tag:natural=fell natural=geyser: ES:Tag:natural=geyser @@ -10225,6 +12049,7 @@ es: natural=gorge: ES:Tag:natural=gorge natural=grassland: ES:Tag:natural=grassland natural=heath: ES:Tag:natural=heath + natural=hill: ES:Tag:natural=hill natural=meadow: ES:Tag:natural=meadow natural=moor: ES:Tag:natural=moor natural=mud: ES:Tag:natural=mud @@ -10249,17 +12074,30 @@ es: natural=water: ES:Tag:natural=water natural=wetland: ES:Tag:natural=wetland natural=wood: ES:Tag:natural=wood + network=CR:national: ES:Tag:network=CR:national + network=VE:L:PO: ES:Tag:network=VE:L:PO network=VE:R:PO: ES:Tag:network=VE:R:PO + network=VE:T:PO: ES:Tag:network=VE:T:PO network=VE:ramal:portuguesa: ES:Tag:network=VE:ramal:portuguesa + office=accountant: ES:Tag:office=accountant office=administrative: ES:Tag:office=administrative office=advertising_agency: ES:Tag:office=advertising agency + office=architect: ES:Tag:office=architect office=association: ES:Tag:office=association + office=charity: ES:Tag:office=charity office=company: ES:Tag:office=company + office=consulting: ES:Tag:office=consulting + office=coworking: ES:Tag:office=coworking + office=educational_institution: ES:Tag:office=educational institution + office=employment_agency: ES:Tag:office=employment agency office=energy_supplier: ES:Tag:office=energy supplier office=engineer: ES:Tag:office=engineer office=estate_agent: ES:Tag:office=estate agent + office=financial: ES:Tag:office=financial + office=forestry: ES:Tag:office=forestry office=foundation: ES:Tag:office=foundation office=government: ES:Tag:office=government + office=guide: ES:Tag:office=guide office=insurance: ES:Tag:office=insurance office=it: ES:Tag:office=it office=lawyer: ES:Tag:office=lawyer @@ -10272,39 +12110,68 @@ es: office=parish: ES:Tag:office=parish office=political_party: ES:Tag:office=political party office=private_investigator: ES:Tag:office=private investigator + office=property_management: ES:Tag:office=property management office=quango: ES:Tag:office=quango office=religion: ES:Tag:office=religion office=research: ES:Tag:office=research office=surveyor: ES:Tag:office=surveyor office=tax: ES:Tag:office=tax + office=tax_advisor: ES:Tag:office=tax advisor + office=telecommunication: ES:Tag:office=telecommunication office=therapist: ES:Tag:office=therapist + office=travel_agent: ES:Tag:office=travel agent + office=visa: ES:Tag:office=visa office=water_utility: ES:Tag:office=water utility + office=yes: ES:Tag:office=yes oneway=reversible: ES:Tag:oneway=reversible + operator=GRDF: ES:Tag:operator=GRDF + parking=street_side: ES:Tag:parking=street side passenger=yes: ES:Tag:passenger=yes + place=allotments: ES:Tag:place=allotments + place=archipelago: ES:Tag:place=archipelago place=borough: ES:Tag:place=borough place=city: ES:Tag:place=city place=city_block: ES:Tag:place=city block + place=continent: ES:Tag:place=continent place=country: ES:Tag:place=country place=county: ES:Tag:place=county place=district: ES:Tag:place=district + place=farm: ES:Tag:place=farm place=hamlet: ES:Tag:place=hamlet place=island: ES:Tag:place=island place=islet: ES:Tag:place=islet place=isolated_dwelling: ES:Tag:place=isolated dwelling + place=locality: ES:Tag:place=locality place=municipality: ES:Tag:place=municipality place=neighbourhood: ES:Tag:place=neighbourhood + place=ocean: ES:Tag:place=ocean place=plot: ES:Tag:place=plot place=province: ES:Tag:place=province + place=quarter: ES:Tag:place=quarter place=region: ES:Tag:place=region + place=sea: ES:Tag:place=sea place=square: ES:Tag:place=square place=state: ES:Tag:place=state place=suburb: ES:Tag:place=suburb place=town: ES:Tag:place=town place=village: ES:Tag:place=village + police=barracks: ES:Tag:police=barracks + police=car_pound: ES:Tag:police=car pound + police=checkpoint: ES:Tag:police=checkpoint + police=detention: ES:Tag:police=detention + police=naval_base: ES:Tag:police=naval base + police=offices: ES:Tag:police=offices + police=range: ES:Tag:police=range + police=storage: ES:Tag:police=storage + police=training_area: ES:Tag:police=training area + police=yes: ES:Tag:police=yes power=generator: ES:Tag:power=generator power=heliostat: ES:Tag:power=heliostat + power=line: ES:Tag:power=line power=pole: ES:Tag:power=pole + power=substation: ES:Tag:power=substation power=tower: ES:Tag:power=tower + power=transformer: ES:Tag:power=transformer public_transport=platform: ES:Tag:public transport=platform public_transport=station: ES:Tag:public transport=station public_transport=stop_area: ES:Tag:public transport=stop area @@ -10315,26 +12182,51 @@ es: railway=crossing: ES:Tag:railway=crossing railway=disused: ES:Tag:railway=disused railway=level_crossing: ES:Tag:railway=level crossing + railway=light_rail: ES:Tag:railway=light rail railway=milestone: ES:Tag:railway=milestone + railway=monorail: ES:Tag:railway=monorail railway=narrow_gauge: ES:Tag:railway=narrow gauge + railway=platform: ES:Tag:railway=platform + railway=rail: ES:Tag:railway=rail + railway=station: ES:Tag:railway=station railway=subway: ES:Tag:railway=subway railway=subway_entrance: ES:Tag:railway=subway entrance + railway=tram: ES:Tag:railway=tram + railway=tram_stop: ES:Tag:railway=tram stop railway=yard: ES:Tag:railway=yard + religion=christian: ES:Tag:religion=christian + residential=university: ES:Tag:residential=university + roller_coaster=track: ES:Tag:roller coaster=track route=bus: ES:Tag:route=bus + route=ferry: ES:Tag:route=ferry + route=light_rail: ES:Tag:route=light rail + route=monorail: ES:Tag:route=monorail + route=railway: ES:Tag:route=railway + route=road: ES:Tag:route=road + route=subway: ES:Tag:route=subway + route=train: ES:Tag:route=train + route=tram: ES:Tag:route=tram route=transhumance: ES:Tag:route=transhumance + route=trolleybus: ES:Tag:route=trolleybus + route=worship: ES:Tag:route=worship service=aircraft_control: ES:Tag:service=aircraft control service=alley: ES:Tag:service=alley service=crossover: ES:Tag:service=crossover + service=drive-through: ES:Tag:service=drive-through service=driveway: ES:Tag:service=driveway + service=emergency_access: ES:Tag:service=emergency access service=parking_aisle: ES:Tag:service=parking aisle service=siding: ES:Tag:service=siding shelter_type=basic_hut: ES:Tag:shelter type=basic hut shelter_type=lean_to: ES:Tag:shelter type=lean to + shelter_type=public_transport: ES:Tag:shelter type=public transport shop=agrarian: ES:Tag:shop=agrarian shop=alcohol: ES:Tag:shop=alcohol + shop=appliance: ES:Tag:shop=appliance shop=art: ES:Tag:shop=art shop=baby_goods: ES:Tag:shop=baby goods shop=bakery: ES:Tag:shop=bakery + shop=bathroom_furnishing: ES:Tag:shop=bathroom furnishing shop=bed: ES:Tag:shop=bed shop=beverages: ES:Tag:shop=beverages shop=bicycle: ES:Tag:shop=bicycle @@ -10344,6 +12236,9 @@ es: shop=car: ES:Tag:shop=car shop=car_parts: ES:Tag:shop=car parts shop=car_repair: ES:Tag:shop=car repair + shop=carpet: ES:Tag:shop=carpet + shop=charity: ES:Tag:shop=charity + shop=chemist: ES:Tag:shop=chemist shop=chocolate: ES:Tag:shop=chocolate shop=clothes: ES:Tag:shop=clothes shop=collector: ES:Tag:shop=collector @@ -10352,33 +12247,53 @@ es: shop=convenience: ES:Tag:shop=convenience shop=copyshop: ES:Tag:shop=copyshop shop=craft: ES:Tag:shop=craft + shop=dairy: ES:Tag:shop=dairy + shop=deli: ES:Tag:shop=deli + shop=department_store: ES:Tag:shop=department store shop=doityourself: ES:Tag:shop=doityourself shop=electrical: ES:Tag:shop=electrical shop=electronics: ES:Tag:shop=electronics shop=energy: ES:Tag:shop=energy + shop=erotic: ES:Tag:shop=erotic shop=fabric: ES:Tag:shop=fabric shop=fashion_accessories: ES:Tag:shop=fashion accessories + shop=fireplace: ES:Tag:shop=fireplace + shop=fishing: ES:Tag:shop=fishing shop=florist: ES:Tag:shop=florist + shop=food: ES:Tag:shop=food shop=funeral_directors: ES:Tag:shop=funeral directors + shop=furniture: ES:Tag:shop=furniture shop=games: ES:Tag:shop=games shop=garden_centre: ES:Tag:shop=garden centre shop=gas: ES:Tag:shop=gas shop=gift: ES:Tag:shop=gift + shop=glaziery: ES:Tag:shop=glaziery shop=greengrocer: ES:Tag:shop=greengrocer shop=hairdresser: ES:Tag:shop=hairdresser shop=hardware: ES:Tag:shop=hardware + shop=health_food: ES:Tag:shop=health food shop=hearing_aids: ES:Tag:shop=hearing aids shop=houseware: ES:Tag:shop=houseware + shop=hunting: ES:Tag:shop=hunting + shop=hvac: ES:Tag:shop=hvac shop=ice_cream: ES:Tag:shop=ice cream + shop=insurance: ES:Tag:shop=insurance + shop=jetski: ES:Tag:shop=jetski shop=jewelry: ES:Tag:shop=jewelry shop=kiosk: ES:Tag:shop=kiosk shop=kitchen: ES:Tag:shop=kitchen shop=laundry: ES:Tag:shop=laundry shop=locksmith: ES:Tag:shop=locksmith shop=lottery: ES:Tag:shop=lottery + shop=mall: ES:Tag:shop=mall + shop=medical: ES:Tag:shop=medical + shop=medical_supply: ES:Tag:shop=medical supply shop=mobile_phone: ES:Tag:shop=mobile phone shop=model: ES:Tag:shop=model shop=motorcycle: ES:Tag:shop=motorcycle + shop=motorcycle_repair: ES:Tag:shop=motorcycle repair + shop=music: ES:Tag:shop=music + shop=musical_instrument: ES:Tag:shop=musical instrument shop=nuts: ES:Tag:shop=nuts shop=optician: ES:Tag:shop=optician shop=outdoor: ES:Tag:shop=outdoor @@ -10386,10 +12301,19 @@ es: shop=party: ES:Tag:shop=party shop=pastry: ES:Tag:shop=pastry shop=pawnbroker: ES:Tag:shop=pawnbroker + shop=perfumery: ES:Tag:shop=perfumery shop=pet: ES:Tag:shop=pet + shop=pet_grooming: ES:Tag:shop=pet grooming + shop=photo: ES:Tag:shop=photo shop=pottery: ES:Tag:shop=pottery + shop=radiotechnics: ES:Tag:shop=radiotechnics + shop=rental: ES:Tag:shop=rental + shop=rice: ES:Tag:shop=rice shop=seafood: ES:Tag:shop=seafood + shop=second_hand: ES:Tag:shop=second hand + shop=security: ES:Tag:shop=security shop=sewing: ES:Tag:shop=sewing + shop=shoe_repair: ES:Tag:shop=shoe repair shop=shoes: ES:Tag:shop=shoes shop=sports: ES:Tag:shop=sports shop=stationery: ES:Tag:shop=stationery @@ -10401,11 +12325,14 @@ es: shop=tiles: ES:Tag:shop=tiles shop=toys: ES:Tag:shop=toys shop=trade: ES:Tag:shop=trade + shop=travel_agency: ES:Tag:shop=travel agency shop=tyres: ES:Tag:shop=tyres + shop=vacant: ES:Tag:shop=vacant shop=variety_store: ES:Tag:shop=variety store shop=video_games: ES:Tag:shop=video games shop=watches: ES:Tag:shop=watches shop=water: ES:Tag:shop=water + shop=weapons: ES:Tag:shop=weapons shop=wholesale: ES:Tag:shop=wholesale shop=window_blind: ES:Tag:shop=window blind shop=yes: ES:Tag:shop=yes @@ -10413,15 +12340,19 @@ es: social_facility=clothing_bank: ES:Tag:social facility=clothing bank social_facility=food_bank: ES:Tag:social facility=food bank social_facility=nursing_home: ES:Tag:social facility=nursing home + social_facility=soup_kitchen: ES:Tag:social facility=soup kitchen source:geometry=Bing: ES:Tag:source:geometry=Bing sport=boules: ES:Tag:sport=boules + sport=bullfighting: ES:Tag:sport=bullfighting sport=chess: ES:Tag:sport=chess sport=cycling: ES:Tag:sport=cycling sport=equestrian: ES:Tag:sport=equestrian sport=futsal: ES:Tag:sport=futsal + sport=handball: ES:Tag:sport=handball sport=model_aerodrome: ES:Tag:sport=model aerodrome sport=motocross: ES:Tag:sport=motocross sport=motor: ES:Tag:sport=motor + sport=multi: ES:Tag:sport=multi sport=orienteering: ES:Tag:sport=orienteering sport=paddle_tennis: ES:Tag:sport=paddle tennis sport=padel: ES:Tag:sport=padel @@ -10429,12 +12360,28 @@ es: sport=pelota: ES:Tag:sport=pelota sport=shooting: ES:Tag:sport=shooting sport=soccer: ES:Tag:sport=soccer + sport=table_tennis: ES:Tag:sport=table tennis + sport=water_polo: ES:Tag:sport=water polo + station=subway: ES:Tag:station=subway + street_vendor=yes: ES:Tag:street vendor=yes surface=asphalt: ES:Tag:surface=asphalt + surface=compacted: ES:Tag:surface=compacted + surface=concrete: ES:Tag:surface=concrete + surface=tartan: ES:Tag:surface=tartan + surface=unpaved: ES:Tag:surface=unpaved switch=disconnector: ES:Tag:switch=disconnector telecom=connection_point: ES:Tag:telecom=connection point telecom=service_device: ES:Tag:telecom=service device + theatre:type=open_air: ES:Tag:theatre:type=open air + tomb=cenotaph: ES:Tag:tomb=cenotaph + tomb=columbarium: ES:Tag:tomb=columbarium + tomb=mausoleum: ES:Tag:tomb=mausoleum + tomb=obelisk: ES:Tag:tomb=obelisk + tomb=pillar: ES:Tag:tomb=pillar + tomb=table: ES:Tag:tomb=table tourism=alpine_hut: ES:Tag:tourism=alpine hut tourism=apartment: ES:Tag:tourism=apartment + tourism=aquarium: ES:Tag:tourism=aquarium tourism=artwork: ES:Tag:tourism=artwork tourism=attraction: ES:Tag:tourism=attraction tourism=camp_site: ES:Tag:tourism=camp site @@ -10450,6 +12397,7 @@ es: tourism=trail_riding_station: ES:Tag:tourism=trail riding station tourism=viewpoint: ES:Tag:tourism=viewpoint tourism=wilderness_hut: ES:Tag:tourism=wilderness hut + tourism=wine_cellar: ES:Tag:tourism=wine cellar tower:type=bell_tower: ES:Tag:tower:type=bell tower tower:type=communication: ES:Tag:tower:type=communication tower:type=cooling: ES:Tag:tower:type=cooling @@ -10458,21 +12406,34 @@ es: tower:type=observation: ES:Tag:tower:type=observation tower:type=watchtower: ES:Tag:tower:type=watchtower traffic_calming=island: ES:Tag:traffic calming=island + trees=oil_palms: ES:Tag:trees=oil palms + tunnel=building_passage: ES:Tag:tunnel=building passage tunnel=culvert: ES:Tag:tunnel=culvert type=public_transport: ES:Tag:type=public transport + type=waterway: ES:Tag:type=waterway + vending=books: ES:Tag:vending=books vending=bread: ES:Tag:vending=bread + vending=chemist: ES:Tag:vending=chemist + vending=condoms: ES:Tag:vending=condoms vending=excrement_bags: ES:Tag:vending=excrement bags + vending=fishing_bait: ES:Tag:vending=fishing bait + vending=fishing_tackle: ES:Tag:vending=fishing tackle vending=flowers: ES:Tag:vending=flowers vending=ice_cream: ES:Tag:vending=ice cream vending=milk: ES:Tag:vending=milk + vending=parcel_mail_in: ES:Tag:vending=parcel mail in + vending=parcel_pickup: ES:Tag:vending=parcel pickup vending=parking_tickets: ES:Tag:vending=parking tickets wall=dry_stone: ES:Tag:wall=dry stone + wall=tire_barrier: ES:Tag:wall=tire barrier water=lagoon: ES:Tag:water=lagoon water=lake: ES:Tag:water=lake + water=pond: ES:Tag:water=pond water=reservoir: ES:Tag:water=reservoir waterway=canal: ES:Tag:waterway=canal waterway=dam: ES:Tag:waterway=dam waterway=ditch: ES:Tag:waterway=ditch + waterway=dock: ES:Tag:waterway=dock waterway=drain: ES:Tag:waterway=drain waterway=milestone: ES:Tag:waterway=milestone waterway=river: ES:Tag:waterway=river @@ -10480,8 +12441,10 @@ es: waterway=stream: ES:Tag:waterway=stream waterway=water_point: ES:Tag:waterway=water point waterway=weir: ES:Tag:waterway=weir + wetland=bog: ES:Tag:wetland=bog wetland=tidalflat: ES:Tag:wetland=tidalflat wetland=wet_meadow: ES:Tag:wetland=wet meadow + worship=stations_of_the_cross: ES:Tag:worship=stations of the cross et: key: addr: Et:Key:addr @@ -10508,12 +12471,16 @@ fa: level: Fa:Key:level loc_name: Fa:Key:loc name name: Fa:Key:name + name:etymology: Fa:Key:name:etymology noexit: Fa:Key:noexit + roof:shape: Fa:Key:roof:shape source: Fa:Key:source traffic_calming: Fa:Key:traffic calming + wikipedia: Fa:Key:wikipedia tag: amenity=fountain: Fa:Tag:amenity=fountain amenity=fuel: Fa:Tag:amenity=fuel + barrier=block: Fa:Tag:barrier=block barrier=cable_barrier: Fa:Tag:barrier=cable barrier highway=footway: Fa:Tag:highway=footway highway=path: Fa:Tag:highway=path @@ -10527,8 +12494,12 @@ fa: highway=unclassified: Fa:Tag:highway=unclassified junction=yes: Fa:Tag:junction=yes man_made=qanat: Fa:Tag:man made=qanat + natural=peak: Fa:Tag:natural=peak + natural=ridge: Fa:Tag:natural=ridge + office=quango: Fa:Tag:office=quango place=country: Fa:Tag:place=country service=alley: Fa:Tag:service=alley + shop=bookmaker: Fa:Tag:shop=bookmaker shop=garden_centre: Fa:Tag:shop=garden centre tower:type=cooling: Fa:Tag:tower:type=cooling waterway=drain: Fa:Tag:waterway=drain @@ -10559,6 +12530,8 @@ fi: operator: Fi:Key:operator parking:lane: Fi:Key:parking:lane parking:lane:both: Fi:Key:parking:lane:both + pihatie: Fi:Key:pihatie + place: Fi:Key:place priority_road: Fi:Key:priority road pyörä_väistää_aina_autoa: Fi:Key:pyörä väistää aina autoa shop: Fi:Key:shop @@ -10637,6 +12610,7 @@ fr: key: CEMT: FR:Key:CEMT FIXME: FR:Key:FIXME + abandoned: FR:Key:abandoned 'abandoned:': 'FR:Key:abandoned:' abutters: FR:Key:abutters access: FR:Key:access @@ -10657,6 +12631,7 @@ fr: area: FR:Key:area artist_name: FR:Key:artist name artwork_type: FR:Key:artwork type + attraction: FR:Key:attraction backrest: FR:Key:backrest backward: FR:Key:backward barrier: FR:Key:barrier @@ -10665,19 +12640,23 @@ fr: bench: FR:Key:bench bicycle: FR:Key:bicycle bicycle_parking: FR:Key:bicycle parking + bicycle_road: FR:Key:bicycle road board_type: FR:Key:board type boat: FR:Key:boat bollard: FR:Key:bollard books: FR:Key:books + branch: FR:Key:branch brand: FR:Key:brand brewery: FR:Key:brewery bridge: FR:Key:bridge bridge:movable: FR:Key:bridge:movable + bridge:structure: FR:Key:bridge:structure building: FR:Key:building building:flats: FR:Key:building:flats building:levels: FR:Key:building:levels building:material: FR:Key:building:material building:part: FR:Key:building:part + building:prefabricated: FR:Key:building:prefabricated building:use: FR:Key:building:use bulk_purchase: FR:Key:bulk purchase bus: FR:Key:bus @@ -10686,6 +12665,10 @@ fr: camp_site: FR:Key:camp site capacity: FR:Key:capacity capacity:disabled: FR:Key:capacity:disabled + cargo: FR:Key:cargo + carpool: FR:Key:carpool + cash_withdrawal: FR:Key:cash withdrawal + charge: FR:Key:charge check_date: FR:Key:check date class:bicycle:commute: FR:Key:class:bicycle:commute clothes: FR:Key:clothes @@ -10696,6 +12679,7 @@ fr: comment: FR:Key:comment communication:bos: FR:Key:communication:bos community_centre: FR:Key:community centre + community_centre:for: FR:Key:community centre:for connection_point: FR:Key:connection point construction: FR:Key:construction contact: FR:Key:contact @@ -10710,6 +12694,7 @@ fr: craft: FR:Key:craft crop: FR:Key:crop crossing: FR:Key:crossing + crossing:activation: FR:Key:crossing:activation crossing:island: FR:Key:crossing:island cuisine: FR:Key:cuisine currency: FR:Key:currency @@ -10717,26 +12702,34 @@ fr: cyclestreet: FR:Key:cyclestreet cycleway: FR:Key:cycleway cycleway:lane: FR:Key:cycleway:lane + cycleway:left: FR:Key:cycleway:left delivery: FR:Key:delivery denomination: FR:Key:denomination denotation: FR:Key:denotation description: FR:Key:description + design: FR:Key:design designation: FR:Key:designation destination: FR:Key:destination diet: FR:Key:diet diet:*: FR:Key:diet:* + diet:kosher: FR:Key:diet:kosher + diet:vegan: FR:Key:diet:vegan diet:vegetarian: FR:Key:diet:vegetarian diplomatic: FR:Key:diplomatic direction: FR:Key:direction dispensing: FR:Key:dispensing distance: FR:Key:distance - 'disused:': 'FR:Key:disused:' door: FR:Key:door drink: FR:Key:drink + drinking_water: FR:Key:drinking water + drinking_water:refill: FR:Key:drinking water:refill + drive_in: FR:Key:drive in + drive_through: FR:Key:drive through dryer: FR:Key:dryer ele: FR:Key:ele email: FR:Key:email embankment: FR:Key:embankment + embassy: FR:Key:embassy emergency: FR:Key:emergency enforcement: FR:Key:enforcement entrance: FR:Key:entrance @@ -10747,8 +12740,10 @@ fr: fax: FR:Key:fax fee: FR:Key:fee female: FR:Key:female + fence_type: FR:Key:fence type fishing: FR:Key:fishing fixme: FR:Key:fixme + floating: FR:Key:floating flood_prone: FR:Key:flood prone foot: FR:Key:foot footway: FR:Key:footway @@ -10775,16 +12770,19 @@ fr: geological: FR:Key:geological government: FR:Key:government grande_circulation: FR:Key:grande circulation + handle: FR:Key:handle happy_hours: FR:Key:happy hours healthcare: FR:Key:healthcare height: FR:Key:height heritage: FR:Key:heritage high_water_mark: FR:Key:high water mark highway: FR:Key:highway + hiking: FR:Key:hiking historic: FR:Key:historic historic:civilization: FR:Key:historic:civilization horse: FR:Key:horse hov: FR:Key:hov + image: FR:Key:image incline: FR:Key:incline indoor: FR:Key:indoor information: FR:Key:information @@ -10793,8 +12791,10 @@ fr: intermittent: FR:Key:intermittent interval: FR:Key:interval junction: FR:Key:junction + kerb: FR:Key:kerb kindergarten:FR: FR:Key:kindergarten:FR ladder: FR:Key:ladder + landfill:waste: FR:Key:landfill:waste landuse: FR:Key:landuse lanes: FR:Key:lanes layer: FR:Key:layer @@ -10804,17 +12804,24 @@ fr: leisure: FR:Key:leisure length: FR:Key:length level: FR:Key:level + lgbtq: FR:Key:lgbtq + line_attachment: FR:Key:line attachment + line_management: FR:Key:line management lit: FR:Key:lit loc_name: FR:Key:loc name + local_authority:FR: FR:Key:local authority:FR location: FR:Key:location lock: FR:Key:lock lock_name: FR:Key:lock name lock_ref: FR:Key:lock ref + locked: FR:Key:locked + lottery: FR:Key:lottery male: FR:Key:male man_made: FR:Key:man made manhole: FR:Key:manhole manufacturer: FR:Key:manufacturer mapillary: FR:Key:mapillary + marker: FR:Key:marker material: FR:Key:material max_age: FR:Key:max age maxage: FR:Key:maxage @@ -10832,20 +12839,26 @@ fr: military: FR:Key:military min_age: FR:Key:min age minage: FR:Key:minage + monitoring:bicycle: FR:Key:monitoring:bicycle monitoring:meteoric_activity: FR:Key:monitoring:meteoric activity + monitoring:water_level: FR:Key:monitoring:water level mooring: FR:Key:mooring motorboat: FR:Key:motorboat motorcycle:parking: FR:Key:motorcycle:parking mountain_pass: FR:Key:mountain pass mtb:scale: FR:Key:mtb:scale name: FR:Key:name + name:br: FR:Key:name:br + name:eu: FR:Key:name:eu name:oc: FR:Key:name:oc + narrow: FR:Key:narrow nat_name: FR:Key:nat name natural: FR:Key:natural network: FR:Key:network noexit: FR:Key:noexit non_existent_levels: FR:Key:non existent levels noname: FR:Key:noname + noref: FR:Key:noref note: FR:Key:note nudism: FR:Key:nudism office: FR:Key:office @@ -10853,9 +12866,13 @@ fr: old_name: FR:Key:old name oneway: FR:Key:oneway oneway:bicycle: FR:Key:oneway:bicycle + open_air: FR:Key:open air + openbenches:id: FR:Key:openbenches:id openfire: FR:Key:openfire opening_date: FR:Key:opening date opening_hours: FR:Key:opening hours + opening_hours:covid19: FR:Key:opening hours:covid19 + openplaques:id: FR:Key:openplaques:id operator: FR:Key:operator operator:type: FR:Key:operator:type organic: FR:Key:organic @@ -10872,6 +12889,7 @@ fr: payment:foo: FR:Key:payment:foo permanent: FR:Key:permanent phone: FR:Key:phone + pilgrimage: FR:Key:pilgrimage piste:difficulty: FR:Key:piste:difficulty piste:grooming: FR:Key:piste:grooming place: FR:Key:place @@ -10891,23 +12909,33 @@ fr: pump: FR:Key:pump railway: FR:Key:railway railway:track_ref: FR:Key:railway:track ref + ramp: FR:Key:ramp ref: FR:Key:ref ref:CEF: FR:Key:ref:CEF ref:ERDF:gdo: FR:Key:ref:ERDF:gdo + ref:EU:EVSE: FR:Key:ref:EU:EVSE ref:FR:42C: FR:Key:ref:FR:42C ref:FR:ARCEP: FR:Key:ref:FR:ARCEP ref:FR:CEF: FR:Key:ref:FR:CEF + ref:FR:CNC: FR:Key:ref:FR:CNC + ref:FR:CRTA: FR:Key:ref:FR:CRTA + ref:FR:DREAL: FR:Key:ref:FR:DREAL ref:FR:FANTOIR: FR:Key:ref:FR:FANTOIR ref:FR:FINESS: FR:Key:ref:FR:FINESS ref:FR:MemorialGenWeb: FR:Key:ref:FR:MemorialGenWeb ref:FR:NAF: FR:Key:ref:FR:NAF ref:FR:Orange: FR:Key:ref:FR:Orange + ref:FR:Orange_mobile: FR:Key:ref:FR:Orange mobile ref:FR:PTT: FR:Key:ref:FR:PTT + ref:FR:RNA: FR:Key:ref:FR:RNA ref:FR:RTE: FR:Key:ref:FR:RTE ref:FR:RTE_nom: FR:Key:ref:FR:RTE nom + ref:FR:SFR: FR:Key:ref:FR:SFR ref:FR:SIREN: FR:Key:ref:FR:SIREN ref:FR:SIRET: FR:Key:ref:FR:SIRET ref:FR:commune: FR:Key:ref:FR:commune + ref:FR:gdo: FR:Key:ref:FR:gdo + ref:FR:museofile: FR:Key:ref:FR:museofile ref:INSEE: FR:Key:ref:INSEE ref:RTE:codnat: FR:Key:ref:RTE:codnat ref:UAI: FR:Key:ref:UAI @@ -10920,6 +12948,7 @@ fr: residential: FR:Key:residential resource: FR:Key:resource right: FR:Key:right + roof:direction: FR:Key:roof:direction roof:material: FR:Key:roof:material room: FR:Key:room ruins: FR:Key:ruins @@ -10927,6 +12956,7 @@ fr: salt: FR:Key:salt sanitary_dump_station: FR:Key:sanitary dump station seamark:fixme: FR:Key:seamark:fixme + seasonal: FR:Key:seasonal second_hand: FR:Key:second hand segregated: FR:Key:segregated self_service: FR:Key:self service @@ -10936,6 +12966,7 @@ fr: shelter_type: FR:Key:shelter type shop: FR:Key:shop short_name: FR:Key:short name + shoulder: FR:Key:shoulder sides: FR:Key:sides sidewalk: FR:Key:sidewalk sinkhole: FR:Key:sinkhole @@ -10947,6 +12978,7 @@ fr: source:date: FR:Key:source:date source:maxspeed: FR:Key:source:maxspeed source:maxwidth: FR:Key:source:maxwidth + source:name:br: FR:Key:source:name:br species: FR:Key:species species:fr: FR:Key:species:fr sport: FR:Key:sport @@ -10955,6 +12987,7 @@ fr: step:condition: FR:Key:step:condition step:contrast: FR:Key:step:contrast step_count: FR:Key:step count + stop: FR:Key:stop support: FR:Key:support surface: FR:Key:surface surveillance: FR:Key:surveillance @@ -10964,6 +12997,7 @@ fr: tactile_paving: FR:Key:tactile paving takeaway: FR:Key:takeaway telecom: FR:Key:telecom + telecom:medium: FR:Key:telecom:medium tickets:public_transport_subscription: FR:Key:tickets:public transport subscription tidal: FR:Key:tidal timezone: FR:Key:timezone @@ -10974,6 +13008,8 @@ fr: tracktype: FR:Key:tracktype traffic_calming: FR:Key:traffic calming traffic_sign: FR:Key:traffic sign + traffic_sign:direction: FR:Key:traffic sign:direction + traffic_signals: FR:Key:traffic signals traffic_signals:direction: FR:Key:traffic signals:direction traffic_signals:sound: FR:Key:traffic signals:sound trail_visibility: FR:Key:trail visibility @@ -10982,13 +13018,16 @@ fr: tunnel: FR:Key:tunnel turn: FR:Key:turn turn:lanes: FR:Key:turn:lanes + turn_to_close: FR:Key:turn to close turning_radius: FR:Key:turning radius type: FR:Key:type type:FR:FINESS: FR:Key:type:FR:FINESS unisex: FR:Key:unisex url: FR:Key:url usage: FR:Key:usage + utility: FR:Key:utility valve: FR:Key:valve + vine_row_orientation: FR:Key:vine row orientation visibility: FR:Key:visibility voltage: FR:Key:voltage waste: FR:Key:waste @@ -11004,6 +13043,7 @@ fr: wikipedia: FR:Key:wikipedia windings: FR:Key:windings xmas:feature: FR:Key:xmas:feature + year_of_construction: FR:Key:year of construction tag: Bascule_publique: FR:Tag:Bascule publique FIXME=Position_estimated: FR:Tag:FIXME=Position estimated @@ -11012,12 +13052,21 @@ fr: access=designated: FR:Tag:access=designated access=no: FR:Tag:access=no access=private: FR:Tag:access=private + actuator=electric_motor: FR:Tag:actuator=electric motor + actuator=hydraulic_cylinder: FR:Tag:actuator=hydraulic cylinder + actuator=manual: FR:Tag:actuator=manual + actuator=pneumatic_cylinder: FR:Tag:actuator=pneumatic cylinder advertising=billboard: FR:Tag:advertising=billboard advertising=board: FR:Tag:advertising=board advertising=column: FR:Tag:advertising=column advertising=flag: FR:Tag:advertising=flag advertising=poster_box: FR:Tag:advertising=poster box + advertising=screen: FR:Tag:advertising=screen + advertising=sculpture: FR:Tag:advertising=sculpture + advertising=sign: FR:Tag:advertising=sign + advertising=tarp: FR:Tag:advertising=tarp advertising=totem: FR:Tag:advertising=totem + advertising=wall_painting: FR:Tag:advertising=wall painting aerialway=cable_car: FR:Tag:aerialway=cable car aerialway=chair_lift: FR:Tag:aerialway=chair lift aeroway=aerodrome: FR:Tag:aeroway=aerodrome @@ -11025,6 +13074,7 @@ fr: aeroway=gate: FR:Tag:aeroway=gate aeroway=hangar: FR:Tag:aeroway=hangar aeroway=helipad: FR:Tag:aeroway=helipad + aeroway=holding_position: FR:Tag:aeroway=holding position aeroway=parking_position: FR:Tag:aeroway=parking position aeroway=runway: FR:Tag:aeroway=runway aeroway=taxiway: FR:Tag:aeroway=taxiway @@ -11041,6 +13091,8 @@ fr: amenity=bicycle_rental: FR:Tag:amenity=bicycle rental amenity=bicycle_repair_station: FR:Tag:amenity=bicycle repair station amenity=biergarten: FR:Tag:amenity=biergarten + amenity=binoculars: FR:Tag:amenity=binoculars + amenity=boat_rental: FR:Tag:amenity=boat rental amenity=boat_sharing: FR:Tag:amenity=boat sharing amenity=brothel: FR:Tag:amenity=brothel amenity=bus_station: FR:Tag:amenity=bus station @@ -11048,7 +13100,9 @@ fr: amenity=car_pooling: FR:Tag:amenity=car pooling amenity=car_rental: FR:Tag:amenity=car rental amenity=car_sharing: FR:Tag:amenity=car sharing + amenity=casino: FR:Tag:amenity=casino amenity=charging_station: FR:Tag:amenity=charging station + amenity=childcare: FR:Tag:amenity=childcare amenity=cinema: FR:Tag:amenity=cinema amenity=clinic: FR:Tag:amenity=clinic amenity=college: FR:Tag:amenity=college @@ -11060,7 +13114,9 @@ fr: amenity=crematorium: FR:Tag:amenity=crematorium amenity=crypt: FR:Tag:amenity=crypt amenity=dentist: FR:Tag:amenity=dentist + amenity=device_charging_station: FR:Tag:amenity=device charging station amenity=doctors: FR:Tag:amenity=doctors + amenity=dog_toilet: FR:Tag:amenity=dog toilet amenity=drinking_water: FR:Tag:amenity=drinking water amenity=driving_school: FR:Tag:amenity=driving school amenity=dryer: FR:Tag:amenity=dryer @@ -11072,8 +13128,11 @@ fr: amenity=food_court: FR:Tag:amenity=food court amenity=fountain: FR:Tag:amenity=fountain amenity=fuel: FR:Tag:amenity=fuel + amenity=funeral_hall: FR:Tag:amenity=funeral hall + amenity=give_box: FR:Tag:amenity=give box amenity=grave_yard: FR:Tag:amenity=grave yard amenity=grit_bin: FR:Tag:amenity=grit bin + amenity=health_post: FR:Tag:amenity=health post amenity=hookah_lounge: FR:Tag:amenity=hookah lounge amenity=hospital: FR:Tag:amenity=hospital amenity=hunting_stand: FR:Tag:amenity=hunting stand @@ -11082,12 +13141,16 @@ fr: amenity=lavoir: FR:Tag:amenity=lavoir amenity=letter_box: FR:Tag:amenity=letter box amenity=library: FR:Tag:amenity=library + amenity=loading_dock: FR:Tag:amenity=loading dock amenity=love_hotel: FR:Tag:amenity=love hotel amenity=marae: FR:Tag:amenity=marae amenity=marketplace: FR:Tag:amenity=marketplace + amenity=monastery: FR:Tag:amenity=monastery amenity=mortuary: FR:Tag:amenity=mortuary amenity=motorcycle_parking: FR:Tag:amenity=motorcycle parking + amenity=music_school: FR:Tag:amenity=music school amenity=nightclub: FR:Tag:amenity=nightclub + amenity=nursing_home: FR:Tag:amenity=nursing home amenity=parking: FR:Tag:amenity=parking amenity=parking_entrance: FR:Tag:amenity=parking entrance amenity=parking_space: FR:Tag:amenity=parking space @@ -11096,7 +13159,9 @@ fr: amenity=place_of_worship: FR:Tag:amenity=place of worship amenity=planetarium: FR:Tag:amenity=planetarium amenity=police: FR:Tag:amenity=police + amenity=polling_station: FR:Tag:amenity=polling station amenity=post_box: FR:Tag:amenity=post box + amenity=post_depot: FR:Tag:amenity=post depot amenity=post_office: FR:Tag:amenity=post office amenity=prison: FR:Tag:amenity=prison amenity=pub: FR:Tag:amenity=pub @@ -11104,6 +13169,7 @@ fr: amenity=reception_desk: FR:Tag:amenity=reception desk amenity=recycling: FR:Tag:amenity=recycling amenity=restaurant: FR:Tag:amenity=restaurant + amenity=retirement_home: FR:Tag:amenity=retirement home amenity=sanitary_dump_station: FR:Tag:amenity=sanitary dump station amenity=school: FR:Tag:amenity=school amenity=shelter: FR:Tag:amenity=shelter @@ -11118,6 +13184,7 @@ fr: amenity=theatre: FR:Tag:amenity=theatre amenity=toilets: FR:Tag:amenity=toilets amenity=townhall: FR:Tag:amenity=townhall + amenity=toy_library: FR:Tag:amenity=toy library amenity=university: FR:Tag:amenity=university amenity=vacuum_cleaner: FR:Tag:amenity=vacuum cleaner amenity=vehicle_inspection: FR:Tag:amenity=vehicle inspection @@ -11126,36 +13193,73 @@ fr: amenity=washing_machine: FR:Tag:amenity=washing machine amenity=waste_basket: FR:Tag:amenity=waste basket amenity=waste_disposal: FR:Tag:amenity=waste disposal + amenity=waste_transfer_station: FR:Tag:amenity=waste transfer station amenity=water_point: FR:Tag:amenity=water point amenity=watering_place: FR:Tag:amenity=watering place amenity=weighbridge: FR:Tag:amenity=weighbridge animal=horse_walker: FR:Tag:animal=horse walker anthropogenic=yes: FR:Tag:anthropogenic=yes + artwork_type=sculpture: FR:Tag:artwork type=sculpture atm=yes: FR:Tag:atm=yes + attraction=animal: FR:Tag:attraction=animal barrier=block: FR:Tag:barrier=block barrier=bollard: FR:Tag:barrier=bollard + barrier=border_control: FR:Tag:barrier=border control + barrier=bump_gate: FR:Tag:barrier=bump gate + barrier=bus_trap: FR:Tag:barrier=bus trap + barrier=cable_barrier: FR:Tag:barrier=cable barrier + barrier=cattle_grid: FR:Tag:barrier=cattle grid + barrier=chain: FR:Tag:barrier=chain barrier=city_wall: FR:Tag:barrier=city wall barrier=cycle_barrier: FR:Tag:barrier=cycle barrier + barrier=debris: FR:Tag:barrier=debris + barrier=ditch: FR:Tag:barrier=ditch barrier=entrance: FR:Tag:barrier=entrance barrier=fence: FR:Tag:barrier=fence + barrier=full-height_turnstile: FR:Tag:barrier=full-height turnstile barrier=gate: FR:Tag:barrier=gate barrier=guard_rail: FR:Tag:barrier=guard rail barrier=hampshire_gate: FR:Tag:barrier=hampshire gate + barrier=handrail: FR:Tag:barrier=handrail barrier=hedge: FR:Tag:barrier=hedge barrier=hedge_bank: FR:Tag:barrier=hedge bank + barrier=height_restrictor: FR:Tag:barrier=height restrictor barrier=horse_stile: FR:Tag:barrier=horse stile + barrier=jersey_barrier: FR:Tag:barrier=jersey barrier + barrier=kent_carriage_gap: FR:Tag:barrier=kent carriage gap + barrier=kerb: FR:Tag:barrier=kerb + barrier=kissing_gate: FR:Tag:barrier=kissing gate barrier=lift_gate: FR:Tag:barrier=lift gate + barrier=log: FR:Tag:barrier=log + barrier=motorcycle_barrier: FR:Tag:barrier=motorcycle barrier barrier=retaining_wall: FR:Tag:barrier=retaining wall barrier=rope: FR:Tag:barrier=rope + barrier=sally_port: FR:Tag:barrier=sally port barrier=select_acces: FR:Tag:barrier=select acces + barrier=spikes: FR:Tag:barrier=spikes + barrier=stile: FR:Tag:barrier=stile + barrier=sump_buster: FR:Tag:barrier=sump buster + barrier=swing_gate: FR:Tag:barrier=swing gate + barrier=tank_trap: FR:Tag:barrier=tank trap + barrier=toll_booth: FR:Tag:barrier=toll booth barrier=turnstile: FR:Tag:barrier=turnstile barrier=wall: FR:Tag:barrier=wall + basin=detention: FR:Tag:basin=detention + basin=infiltration: FR:Tag:basin=infiltration + basin=retention: FR:Tag:basin=retention bicycle=use_sidepath: FR:Tag:bicycle=use sidepath boundary=administrative: FR:Tag:boundary=administrative + boundary=special_economic_zone: FR:Tag:boundary=special economic zone brand=Trilib': FR:Tag:brand=Trilib' + bridge=aqueduct: FR:Tag:bridge=aqueduct bridge=boardwalk: FR:Tag:bridge=boardwalk + bridge=cantilever: FR:Tag:bridge=cantilever + bridge=movable: FR:Tag:bridge=movable + bridge=trestle: FR:Tag:bridge=trestle + bridge=viaduct: FR:Tag:bridge=viaduct building=apartments: FR:Tag:building=apartments building=barn: FR:Tag:building=barn + building=bridge: FR:Tag:building=bridge building=cabin: FR:Tag:building=cabin building=chapel: FR:Tag:building=chapel building=church: FR:Tag:building=church @@ -11163,8 +13267,11 @@ fr: building=construction: FR:Tag:building=construction building=detached: FR:Tag:building=detached building=farm: FR:Tag:building=farm + building=fire_station: FR:Tag:building=fire station building=garage: FR:Tag:building=garage building=garages: FR:Tag:building=garages + building=gatehouse: FR:Tag:building=gatehouse + building=ger: FR:Tag:building=ger building=grandstand: FR:Tag:building=grandstand building=greenhouse: FR:Tag:building=greenhouse building=hangar: FR:Tag:building=hangar @@ -11172,12 +13279,15 @@ fr: building=house: FR:Tag:building=house building=hut: FR:Tag:building=hut building=kiosk: FR:Tag:building=kiosk + building=office: FR:Tag:building=office building=pavilion: FR:Tag:building=pavilion building=public: FR:Tag:building=public building=residential: FR:Tag:building=residential + building=retail: FR:Tag:building=retail building=riding_hall: FR:Tag:building=riding hall building=roof: FR:Tag:building=roof building=ruins: FR:Tag:building=ruins + building=semidetached_house: FR:Tag:building=semidetached house building=shed: FR:Tag:building=shed building=sports_hall: FR:Tag:building=sports hall building=stable: FR:Tag:building=stable @@ -11215,6 +13325,7 @@ fr: craft=engraver: FR:Tag:craft=engraver craft=floorer: FR:Tag:craft=floorer craft=gardener: FR:Tag:craft=gardener + craft=glassblower: FR:Tag:craft=glassblower craft=glaziery: FR:Tag:craft=glaziery craft=goldsmith: FR:Tag:craft=goldsmith craft=grinding_mill: FR:Tag:craft=grinding mill @@ -11276,16 +13387,29 @@ fr: cycleway=opposite_lane: FR:Tag:cycleway=opposite lane cycleway=share_busway: FR:Tag:cycleway=share busway disused=yes: FR:Tag:disused=yes - emergency=aed: FR:Tag:emergency=aed + emergency=access_point: FR:Tag:emergency=access point + emergency=ambulance_station: FR:Tag:emergency=ambulance station + emergency=assembly_point: FR:Tag:emergency=assembly point emergency=defibrillator: FR:Tag:emergency=defibrillator + emergency=dry_riser_inlet: FR:Tag:emergency=dry riser inlet emergency=emergency_ward_entrance: FR:Tag:emergency=emergency ward entrance + emergency=fire_alarm_box: FR:Tag:emergency=fire alarm box emergency=fire_extinguisher: FR:Tag:emergency=fire extinguisher + emergency=fire_flapper: FR:Tag:emergency=fire flapper emergency=fire_hose: FR:Tag:emergency=fire hose emergency=fire_hydrant: FR:Tag:emergency=fire hydrant + emergency=fire_sand_bin: FR:Tag:emergency=fire sand bin + emergency=fire_water_pond: FR:Tag:emergency=fire water pond + emergency=landing_site: FR:Tag:emergency=landing site + emergency=life_ring: FR:Tag:emergency=life ring + emergency=lifeguard: FR:Tag:emergency=lifeguard + emergency=lifeguard_tower: FR:Tag:emergency=lifeguard tower + emergency=mountain_rescue: FR:Tag:emergency=mountain rescue emergency=phone: FR:Tag:emergency=phone emergency=siren: FR:Tag:emergency=siren emergency=suction_point: FR:Tag:emergency=suction point emergency=water_rescue_station: FR:Tag:emergency=water rescue station + emergency=water_tank: FR:Tag:emergency=water tank fast_food=cafeteria: FR:Tag:fast food=cafeteria footway=crossing: FR:Tag:footway=crossing footway=sidewalk: FR:Tag:footway=sidewalk @@ -11306,8 +13430,13 @@ fr: generator:source=solar: FR:Tag:generator:source=solar generator:source=tidal: FR:Tag:generator:source=tidal generator:source=wind: FR:Tag:generator:source=wind + government=ministry: FR:Tag:government=ministry + government=register_office: FR:Tag:government=register office + government=tax: FR:Tag:government=tax handle=wheel: FR:Tag:handle=wheel + healthcare=blood_donation: FR:Tag:healthcare=blood donation healthcare=laboratory: FR:Tag:healthcare=laboratory + healthcare=physiotherapist: FR:Tag:healthcare=physiotherapist highway=bridleway: FR:Tag:highway=bridleway highway=bus_guideway: FR:Tag:highway=bus guideway highway=bus_stop: FR:Tag:highway=bus stop @@ -11323,6 +13452,7 @@ fr: highway=milestone: FR:Tag:highway=milestone highway=mini_roundabout: FR:Tag:highway=mini roundabout highway=motorway: FR:Tag:highway=motorway + highway=motorway_junction: FR:Tag:highway=motorway junction highway=motorway_link: FR:Tag:highway=motorway link highway=path: FR:Tag:highway=path highway=pedestrian: FR:Tag:highway=pedestrian @@ -11338,6 +13468,7 @@ fr: highway=speed_display: FR:Tag:highway=speed display highway=steps: FR:Tag:highway=steps highway=stop: FR:Tag:highway=stop + highway=street_lamp: FR:Tag:highway=street lamp highway=tertiary: FR:Tag:highway=tertiary highway=track: FR:Tag:highway=track highway=traffic_mirror: FR:Tag:highway=traffic mirror @@ -11351,6 +13482,7 @@ fr: historic=boundary_stone: FR:Tag:historic=boundary stone historic=cannon: FR:Tag:historic=cannon historic=castle: FR:Tag:historic=castle + historic=charcoal_pile: FR:Tag:historic=charcoal pile historic=city_gate: FR:Tag:historic=city gate historic=citywalls: FR:Tag:historic=citywalls historic=farm: FR:Tag:historic=farm @@ -11403,17 +13535,20 @@ fr: landuse=grass: FR:Tag:landuse=grass landuse=greenhouse_horticulture: FR:Tag:landuse=greenhouse horticulture landuse=industrial: FR:Tag:landuse=industrial + landuse=landfill: FR:Tag:landuse=landfill landuse=meadow: FR:Tag:landuse=meadow landuse=orchard: FR:Tag:landuse=orchard landuse=plant_nursery: FR:Tag:landuse=plant nursery landuse=pond: FR:Tag:landuse=pond landuse=quarry: FR:Tag:landuse=quarry + landuse=religious: FR:Tag:landuse=religious landuse=residential: FR:Tag:landuse=residential landuse=retail: FR:Tag:landuse=retail landuse=salt_pond: FR:Tag:landuse=salt pond landuse=village_green: FR:Tag:landuse=village green leaf_cycle=deciduous: FR:Tag:leaf cycle=deciduous leisure=bandstand: FR:Tag:leisure=bandstand + leisure=bird_hide: FR:Tag:leisure=bird hide leisure=bleachers: FR:Tag:leisure=bleachers leisure=bowling_alley: FR:Tag:leisure=bowling alley leisure=dance: FR:Tag:leisure=dance @@ -11422,6 +13557,7 @@ fr: leisure=firepit: FR:Tag:leisure=firepit leisure=fishing: FR:Tag:leisure=fishing leisure=fitness_centre: FR:Tag:leisure=fitness centre + leisure=fitness_station: FR:Tag:leisure=fitness station leisure=garden: FR:Tag:leisure=garden leisure=golf_course: FR:Tag:leisure=golf course leisure=hackerspace: FR:Tag:leisure=hackerspace @@ -11441,12 +13577,21 @@ fr: leisure=tanning_salon: FR:Tag:leisure=tanning salon leisure=track: FR:Tag:leisure=track leisure=water_park: FR:Tag:leisure=water park + line_attachment=anchor: FR:Tag:line attachment=anchor + line_attachment=pin: FR:Tag:line attachment=pin + line_attachment=pulley: FR:Tag:line attachment=pulley + line_attachment=suspension: FR:Tag:line attachment=suspension + line_management=branch: FR:Tag:line management=branch + line_management=split: FR:Tag:line management=split man_made=adit: FR:Tag:man made=adit man_made=beehive: FR:Tag:man made=beehive + man_made=bridge: FR:Tag:man made=bridge man_made=carpet_hanger: FR:Tag:man made=carpet hanger man_made=cutline: FR:Tag:man made=cutline man_made=dovecote: FR:Tag:man made=dovecote man_made=flagpole: FR:Tag:man made=flagpole + man_made=flare: FR:Tag:man made=flare + man_made=ice_house: FR:Tag:man made=ice house man_made=insect_hotel: FR:Tag:man made=insect hotel man_made=kiln: FR:Tag:man made=kiln man_made=lighthouse: FR:Tag:man made=lighthouse @@ -11455,20 +13600,32 @@ fr: man_made=monitoring_station: FR:Tag:man made=monitoring station man_made=petroleum_well: FR:Tag:man made=petroleum well man_made=pier: FR:Tag:man made=pier + man_made=planter: FR:Tag:man made=planter man_made=pumping_rig: FR:Tag:man made=pumping rig man_made=reservoir_covered: FR:Tag:man made=reservoir covered + man_made=snow_cannon: FR:Tag:man made=snow cannon man_made=street_cabinet: FR:Tag:man made=street cabinet man_made=surveillance: FR:Tag:man made=surveillance man_made=survey_point: FR:Tag:man made=survey point man_made=tower: FR:Tag:man made=tower man_made=wastewater_plant: FR:Tag:man made=wastewater plant + man_made=water_tap: FR:Tag:man made=water tap man_made=water_tower: FR:Tag:man made=water tower man_made=water_well: FR:Tag:man made=water well man_made=water_works: FR:Tag:man made=water works man_made=watermill: FR:Tag:man made=watermill + man_made=wildlife_crossing: FR:Tag:man made=wildlife crossing man_made=windmill: FR:Tag:man made=windmill man_made=windpump: FR:Tag:man made=windpump + man_made_chimney: FR:Tag:man made chimney + marker=aerial: FR:Tag:marker=aerial + marker=ground: FR:Tag:marker=ground + marker=pedestal: FR:Tag:marker=pedestal + marker=plate: FR:Tag:marker=plate + marker=post: FR:Tag:marker=post + marker=stone: FR:Tag:marker=stone medical=aed: FR:Tag:medical=aed + memorial=ghost_bike: FR:Tag:memorial=ghost bike memorial=plaque: FR:Tag:memorial=plaque microbrewery=yes: FR:Tag:microbrewery=yes military=bunker: FR:Tag:military=bunker @@ -11486,6 +13643,7 @@ fr: natural=saddle: FR:Tag:natural=saddle natural=scree: FR:Tag:natural=scree natural=scrub: FR:Tag:natural=scrub + natural=shrub: FR:Tag:natural=shrub natural=sinkhole: FR:Tag:natural=sinkhole natural=spring: FR:Tag:natural=spring natural=stone: FR:Tag:natural=stone @@ -11494,8 +13652,11 @@ fr: natural=volcano: FR:Tag:natural=volcano natural=water: FR:Tag:natural=water natural=wetland: FR:Tag:natural=wetland + natural=wood: FR:Tag:natural=wood + office=advertising_agency: FR:Tag:office=advertising agency office=association: FR:Tag:office=association office=company: FR:Tag:office=company + office=diplomatic: FR:Tag:office=diplomatic office=educational_institution: FR:Tag:office=educational institution office=employment_agency: FR:Tag:office=employment agency office=estate_agent: FR:Tag:office=estate agent @@ -11503,19 +13664,31 @@ fr: office=government: FR:Tag:office=government office=insurance: FR:Tag:office=insurance office=lawyer: FR:Tag:office=lawyer + office=logistics: FR:Tag:office=logistics + office=newspaper: FR:Tag:office=newspaper office=ngo: FR:Tag:office=ngo + office=political_party: FR:Tag:office=political party + office=religion: FR:Tag:office=religion + operator=ERDF: FR:Tag:operator=ERDF + operator=Enedis: FR:Tag:operator=Enedis + operator=GRDF: FR:Tag:operator=GRDF + parking=street_side: FR:Tag:parking=street side + pipeline=valve: FR:Tag:pipeline=valve piste:type=nordic: FR:Tag:piste:type=nordic place=city: FR:Tag:place=city place=hamlet: FR:Tag:place=hamlet place=island: FR:Tag:place=island place=isolated_dwelling: FR:Tag:place=isolated dwelling place=locality: FR:Tag:place=locality + place=municipality: FR:Tag:place=municipality place=neighbourhood: FR:Tag:place=neighbourhood place=square: FR:Tag:place=square place=suburb: FR:Tag:place=suburb place=town: FR:Tag:place=town place=village: FR:Tag:place=village + plant:source=nuclear: FR:Tag:plant:source=nuclear power=cable: FR:Tag:power=cable + power=circuit: FR:Tag:power=circuit power=compensator: FR:Tag:power=compensator power=converter: FR:Tag:power=converter power=generator: FR:Tag:power=generator @@ -11579,6 +13752,7 @@ fr: segregated=no: FR:Tag:segregated=no segregated=yes: FR:Tag:segregated=yes service=alley: FR:Tag:service=alley + service=drive-through: FR:Tag:service=drive-through service=driveway: FR:Tag:service=driveway service=parking_aisle: FR:Tag:service=parking aisle shelter_type=basic_hut: FR:Tag:shelter type=basic hut @@ -11597,6 +13771,7 @@ fr: shop=books: FR:Tag:shop=books shop=boutique: FR:Tag:shop=boutique shop=butcher: FR:Tag:shop=butcher + shop=cannabis: FR:Tag:shop=cannabis shop=car: FR:Tag:shop=car shop=car_parts: FR:Tag:shop=car parts shop=car_repair: FR:Tag:shop=car repair @@ -11613,6 +13788,7 @@ fr: shop=dive: FR:Tag:shop=dive shop=doityourself: FR:Tag:shop=doityourself shop=dry_cleaning: FR:Tag:shop=dry cleaning + shop=e-cigarette: FR:Tag:shop=e-cigarette shop=electronics: FR:Tag:shop=electronics shop=erotic: FR:Tag:shop=erotic shop=farm: FR:Tag:shop=farm @@ -11626,10 +13802,12 @@ fr: shop=furniture: FR:Tag:shop=furniture shop=garden_centre: FR:Tag:shop=garden centre shop=gift: FR:Tag:shop=gift + shop=greengrocer: FR:Tag:shop=greengrocer shop=haberdashery: FR:Tag:shop=haberdashery shop=hairdresser: FR:Tag:shop=hairdresser shop=hardware: FR:Tag:shop=hardware shop=household_linen: FR:Tag:shop=household linen + shop=houseware: FR:Tag:shop=houseware shop=hunting: FR:Tag:shop=hunting shop=interior_decoration: FR:Tag:shop=interior decoration shop=jewelry: FR:Tag:shop=jewelry @@ -11652,25 +13830,32 @@ fr: shop=second_hand: FR:Tag:shop=second hand shop=sewing: FR:Tag:shop=sewing shop=shoes: FR:Tag:shop=shoes + shop=stationery: FR:Tag:shop=stationery shop=supermarket: FR:Tag:shop=supermarket shop=ticket: FR:Tag:shop=ticket shop=toys: FR:Tag:shop=toys shop=trade: FR:Tag:shop=trade shop=vacant: FR:Tag:shop=vacant + shop=variety_store: FR:Tag:shop=variety store shop=video: FR:Tag:shop=video shop=video_games: FR:Tag:shop=video games sinkhole=estavelle: FR:Tag:sinkhole=estavelle + social_facility=ambulatory_care: FR:Tag:social facility=ambulatory care sport=8pin: FR:Tag:sport=8pin sport=archery: FR:Tag:sport=archery sport=billiards: FR:Tag:sport=billiards sport=bmx: FR:Tag:sport=bmx sport=boules: FR:Tag:sport=boules + sport=chinlone: FR:Tag:sport=chinlone sport=climbing: FR:Tag:sport=climbing sport=darts: FR:Tag:sport=darts sport=equestrian: FR:Tag:sport=equestrian sport=fencing: FR:Tag:sport=fencing sport=free_flying: FR:Tag:sport=free flying + sport=hockey: FR:Tag:sport=hockey sport=horse_racing: FR:Tag:sport=horse racing + sport=rugby_league: FR:Tag:sport=rugby league + sport=rugby_union: FR:Tag:sport=rugby union sport=sailing: FR:Tag:sport=sailing sport=shooting: FR:Tag:sport=shooting sport=skateboard: FR:Tag:sport=skateboard @@ -11683,10 +13868,15 @@ fr: switch=disconnector: FR:Tag:switch=disconnector switch=earthing: FR:Tag:switch=earthing switch=mechanical: FR:Tag:switch=mechanical + telecom:medium=coaxial: FR:Tag:telecom:medium=coaxial + telecom:medium=copper: FR:Tag:telecom:medium=copper + telecom:medium=fibre: FR:Tag:telecom:medium=fibre telecom=connection_point: FR:Tag:telecom=connection point telecom=data_center: FR:Tag:telecom=data center + telecom=distribution_point: FR:Tag:telecom=distribution point telecom=exchange: FR:Tag:telecom=exchange telecom=service_device: FR:Tag:telecom=service device + theatre:type=open_air: FR:Tag:theatre:type=open air tickets:public_transport=yes: FR:Tag:tickets:public transport=yes tourism=alpine_hut: FR:Tag:tourism=alpine hut tourism=apartment: FR:Tag:tourism=apartment @@ -11713,6 +13903,7 @@ fr: tower:type=bell_tower: FR:Tag:tower:type=bell tower tower:type=communication: FR:Tag:tower:type=communication tower:type=hose: FR:Tag:tower:type=hose + traffic_calming=table: FR:Tag:traffic calming=table traffic_sign=city_limit: FR:Tag:traffic sign=city limit transformer=auxiliary: FR:Tag:transformer=auxiliary transformer=distribution: FR:Tag:transformer=distribution @@ -11720,16 +13911,27 @@ fr: transformer=traction: FR:Tag:transformer=traction tunnel=culvert: FR:Tag:tunnel=culvert tunnel=flooded: FR:Tag:tunnel=flooded + type=waterway: FR:Tag:type=waterway usage=headrace: FR:Tag:usage=headrace usage=irrigation: FR:Tag:usage=irrigation usage=penstock: FR:Tag:usage=penstock usage=spillway: FR:Tag:usage=spillway usage=tailrace: FR:Tag:usage=tailrace + utility=power: FR:Tag:utility=power + utility=street_lighting: FR:Tag:utility=street lighting + utility=telecom: FR:Tag:utility=telecom + valve=ball: FR:Tag:valve=ball + valve=butterfly: FR:Tag:valve=butterfly + valve=gate: FR:Tag:valve=gate + valve=globe: FR:Tag:valve=globe + valve=needle: FR:Tag:valve=needle + valve=plug: FR:Tag:valve=plug vending=bread: FR:Tag:vending=bread vending=chemist: FR:Tag:vending=chemist vending=coffee: FR:Tag:vending=coffee vending=condoms: FR:Tag:vending=condoms vending=drinks: FR:Tag:vending=drinks + vending=e-cigarettes: FR:Tag:vending=e-cigarettes vending=electronics: FR:Tag:vending=electronics vending=excrement_bags: FR:Tag:vending=excrement bags vending=fishing_bait: FR:Tag:vending=fishing bait @@ -11743,6 +13945,7 @@ fr: vending=water: FR:Tag:vending=water wall=no: FR:Tag:wall=no waste=dog_excrement: FR:Tag:waste=dog excrement + water=pond: FR:Tag:water=pond water=reservoir: FR:Tag:water=reservoir waterway=boatyard: FR:Tag:waterway=boatyard waterway=canal: FR:Tag:waterway=canal @@ -11758,13 +13961,21 @@ fr: waterway=stream: FR:Tag:waterway=stream waterway=waterfall: FR:Tag:waterway=waterfall waterway=weir: FR:Tag:waterway=weir + wetland=marsh: FR:Tag:wetland=marsh wetland=reedbed: FR:Tag:wetland=reedbed wetland=swamp: FR:Tag:wetland=swamp gl: key: + contact:facebook: Gl:Key:contact:facebook + contact:twitter: Gl:Key:contact:twitter + facebook: Gl:Key:facebook imagery_used: Gl:Key:imagery used locale: Gl:Key:locale name: Gl:Key:name + name:gl: Gl:Key:name:gl + noaddress: Gl:Key:noaddress + nohousenumber: Gl:Key:nohousenumber + noname: Gl:Key:noname route: Gl:Key:route sport: Gl:Key:sport tourism: Gl:Key:tourism @@ -11776,11 +13987,15 @@ gl: barrier=fence: Gl:Tag:barrier=fence barrier=hedge: Gl:Tag:barrier=hedge barrier=kerb: Gl:Tag:barrier=kerb + emergency=emergency_ward_entrance: Gl:Tag:emergency=emergency ward entrance + emergency=yes: Gl:Tag:emergency=yes leisure=outdoor_seating: Gl:Tag:leisure=outdoor seating natural=tree_row: Gl:Tag:natural=tree row railway=tram: Gl:Tag:railway=tram + shop=vacant: Gl:Tag:shop=vacant social_facility=nursing_home: Gl:Tag:social facility=nursing home sport=padel: Gl:Tag:sport=padel + vending=books: Gl:Tag:vending=books waterway=dock: Gl:Tag:waterway=dock waterway=weir: Gl:Tag:waterway=weir he: @@ -11850,12 +14065,17 @@ hu: barrier=bollard: Hu:Tag:barrier=bollard boundary=administrative: Hu:Tag:boundary=administrative highway=street_lamp: Hu:Tag:highway=street lamp + leaf_cycle=deciduous: Hu:Tag:leaf cycle=deciduous + leaf_cycle=evergreen: Hu:Tag:leaf cycle=evergreen + leaf_type=needleleaved: Hu:Tag:leaf type=needleleaved natural=wallow: Hu:Tag:natural=wallow railway=level_crossing: Hu:Tag:railway=level crossing id: tag: highway=track: Id:Tag:highway=track + place=square: Id:Tag:place=square shop=pawnbroker: Id:Tag:shop=pawnbroker + waterway=tidal_channel: Id:Tag:waterway=tidal channel it: key: abutters: IT:Key:abutters @@ -11874,14 +14094,20 @@ it: basin: IT:Key:basin bicycle: IT:Key:bicycle bicycle_parking: IT:Key:bicycle parking + books: IT:Key:books boundary: IT:Key:boundary + brewery: IT:Key:brewery bridge: IT:Key:bridge bridge:structure: IT:Key:bridge:structure building: IT:Key:building building:levels: IT:Key:building:levels cables: IT:Key:cables + capacity: IT:Key:capacity circuits: IT:Key:circuits + communication:amateur_radio:callsign: IT:Key:communication:amateur radio:callsign communication:amateur_radio:repeater: IT:Key:communication:amateur radio:repeater + communication:bos: IT:Key:communication:bos + communication:mobile_phone: IT:Key:communication:mobile phone construction: IT:Key:construction contact:facebook: IT:Key:contact:facebook craft: IT:Key:craft @@ -11893,6 +14119,8 @@ it: destination: IT:Key:destination diet: IT:Key:diet diet:*: IT:Key:diet:* + diet:vegan: IT:Key:diet:vegan + diet:vegetarian: IT:Key:diet:vegetarian 'disused:': 'IT:Key:disused:' drink: IT:Key:drink ele: IT:Key:ele @@ -11905,6 +14133,8 @@ it: garden:type: IT:Key:garden:type generator:output: IT:Key:generator:output geological: IT:Key:geological + guest_house: IT:Key:guest house + height: IT:Key:height highway: IT:Key:highway historic: IT:Key:historic incline: IT:Key:incline @@ -11916,6 +14146,8 @@ it: leisure: IT:Key:leisure lock: IT:Key:lock man_made: IT:Key:man made + manhole: IT:Key:manhole + material: IT:Key:material maxaxleload: IT:Key:maxaxleload maxheight: IT:Key:maxheight maxlength: IT:Key:maxlength @@ -11953,12 +14185,17 @@ it: power: IT:Key:power priority: IT:Key:priority proposed: IT:Key:proposed + pump: IT:Key:pump railway: IT:Key:railway ref: IT:Key:ref + ref:catasto: IT:Key:ref:catasto ref:mise: IT:Key:ref:mise + ref:msal: IT:Key:ref:msal ref:vatin: IT:Key:ref:vatin religion: IT:Key:religion residential: IT:Key:residential + roof:shape: IT:Key:roof:shape + roundtrip: IT:Key:roundtrip route: IT:Key:route sac_scale: IT:Key:sac scale second_hand: IT:Key:second hand @@ -11982,6 +14219,7 @@ it: trail_visibility: IT:Key:trail visibility tunnel: IT:Key:tunnel type: IT:Key:type + usage: IT:Key:usage voltage: IT:Key:voltage waterway: IT:Key:waterway wheelchair: IT:Key:wheelchair @@ -11990,6 +14228,7 @@ it: wires: IT:Key:wires zone:maxspeed: IT:Key:zone:maxspeed tag: + access=customers: IT:Tag:access=customers aeroway=aerodrome: IT:Tag:aeroway=aerodrome aeroway=airstrip: IT:Tag:aeroway=airstrip aeroway=apron: IT:Tag:aeroway=apron @@ -12013,12 +14252,15 @@ it: amenity=bar: IT:Tag:amenity=bar amenity=bbq: IT:Tag:amenity=bbq amenity=bench: IT:Tag:amenity=bench + amenity=bicycle_parking: IT:Tag:amenity=bicycle parking amenity=bicycle_rental: IT:Tag:amenity=bicycle rental amenity=cafe: IT:Tag:amenity=cafe amenity=cinema: IT:Tag:amenity=cinema amenity=college: IT:Tag:amenity=college + amenity=dentist: IT:Tag:amenity=dentist amenity=driving_school: IT:Tag:amenity=driving school amenity=fast_food: IT:Tag:amenity=fast food + amenity=fire_station: IT:Tag:amenity=fire station amenity=fountain: IT:Tag:amenity=fountain amenity=fuel: IT:Tag:amenity=fuel amenity=hospital: IT:Tag:amenity=hospital @@ -12031,11 +14273,13 @@ it: amenity=place_of_worship: IT:Tag:amenity=place of worship amenity=police: IT:Tag:amenity=police amenity=post_office: IT:Tag:amenity=post office + amenity=prison: IT:Tag:amenity=prison amenity=pub: IT:Tag:amenity=pub amenity=recycling: IT:Tag:amenity=recycling amenity=restaurant: IT:Tag:amenity=restaurant amenity=school: IT:Tag:amenity=school amenity=spa: IT:Tag:amenity=spa + amenity=taxi: IT:Tag:amenity=taxi amenity=university: IT:Tag:amenity=university amenity=waste_basket: IT:Tag:amenity=waste basket barrier=block: IT:Tag:barrier=block @@ -12078,6 +14322,7 @@ it: barrier=toll_booth: IT:Tag:barrier=toll booth barrier=turnstile: IT:Tag:barrier=turnstile barrier=wall: IT:Tag:barrier=wall + bridge=boardwalk: IT:Tag:bridge=boardwalk building=residential: IT:Tag:building=residential building=retail: IT:Tag:building=retail building=train_station: IT:Tag:building=train station @@ -12152,9 +14397,13 @@ it: craft=watchmaker: IT:Tag:craft=watchmaker craft=window_construction: IT:Tag:craft=window construction craft=winery: IT:Tag:craft=winery + crossing=traffic_signals: IT:Tag:crossing=traffic signals emergency=assembly_point: IT:Tag:emergency=assembly point + emergency=defibrillator: IT:Tag:emergency=defibrillator emergency=emergency_ward_entrance: IT:Tag:emergency=emergency ward entrance emergency=fire_hydrant: IT:Tag:emergency=fire hydrant + emergency=landing_site: IT:Tag:emergency=landing site + esperanto=yes: IT:Tag:esperanto=yes footway=crossing: IT:Tag:footway=crossing footway=sidewalk: IT:Tag:footway=sidewalk geological=moraine: IT:Tag:geological=moraine @@ -12163,9 +14412,11 @@ it: highway=bus_stop: IT:Tag:highway=bus stop highway=crossing: IT:Tag:highway=crossing highway=cycleway: IT:Tag:highway=cycleway + highway=emergency_bay: IT:Tag:highway=emergency bay highway=footway: IT:Tag:highway=footway highway=ford: IT:Tag:highway=ford highway=living_street: IT:Tag:highway=living street + highway=milestone: IT:Tag:highway=milestone highway=mini_roundabout: IT:Tag:highway=mini roundabout highway=motorway: IT:Tag:highway=motorway highway=motorway_junction: IT:Tag:highway=motorway junction @@ -12194,6 +14445,7 @@ it: junction=yes: IT:Tag:junction=yes landuse=cemetery: IT:Tag:landuse=cemetery landuse=construction: IT:Tag:landuse=construction + landuse=flowerbed: IT:Tag:landuse=flowerbed landuse=greenhouse_horticulture: IT:Tag:landuse=greenhouse horticulture landuse=retail: IT:Tag:landuse=retail landuse=salt_pond: IT:Tag:landuse=salt pond @@ -12205,8 +14457,11 @@ it: leisure=playground: IT:Tag:leisure=playground leisure=swimming_pool: IT:Tag:leisure=swimming pool leisure=track: IT:Tag:leisure=track + man_made=cairn: IT:Tag:man made=cairn + man_made=goods_conveyor: IT:Tag:man made=goods conveyor man_made=mast: IT:Tag:man made=mast man_made=works: IT:Tag:man made=works + memorial=stolperstein: IT:Tag:memorial=stolperstein natural=bare_rock: IT:Tag:natural=bare rock natural=cape: IT:Tag:natural=cape natural=grassland: IT:Tag:natural=grassland @@ -12218,6 +14473,7 @@ it: office=foundation: IT:Tag:office=foundation office=it: IT:Tag:office=it oneway=alternating: IT:Tag:oneway=alternating + parking=street_side: IT:Tag:parking=street side place=allotments: IT:Tag:place=allotments place=archipelago: IT:Tag:place=archipelago place=borough: IT:Tag:place=borough @@ -12265,7 +14521,9 @@ it: residential=rural: IT:Tag:residential=rural residential=urban: IT:Tag:residential=urban route=bus: IT:Tag:route=bus + route=ferry: IT:Tag:route=ferry route=railway: IT:Tag:route=railway + shelter_type=public_transport: IT:Tag:shelter type=public transport shop=alcohol: IT:Tag:shop=alcohol shop=bakery: IT:Tag:shop=bakery shop=beauty: IT:Tag:shop=beauty @@ -12278,6 +14536,7 @@ it: shop=chemist: IT:Tag:shop=chemist shop=clothes: IT:Tag:shop=clothes shop=coffee: IT:Tag:shop=coffee + shop=computer: IT:Tag:shop=computer shop=confectionery: IT:Tag:shop=confectionery shop=convenience: IT:Tag:shop=convenience shop=deli: IT:Tag:shop=deli @@ -12288,12 +14547,16 @@ it: shop=greengrocer: IT:Tag:shop=greengrocer shop=hardware: IT:Tag:shop=hardware shop=hifi: IT:Tag:shop=hifi + shop=ice_cream: IT:Tag:shop=ice cream shop=kiosk: IT:Tag:shop=kiosk + shop=laundry: IT:Tag:shop=laundry shop=mall: IT:Tag:shop=mall shop=motorcycle: IT:Tag:shop=motorcycle shop=newsagent: IT:Tag:shop=newsagent shop=pastry: IT:Tag:shop=pastry + shop=pet_grooming: IT:Tag:shop=pet grooming shop=radiotechnics: IT:Tag:shop=radiotechnics + shop=robot: IT:Tag:shop=robot shop=seafood: IT:Tag:shop=seafood shop=souvenir: IT:Tag:shop=souvenir shop=supermarket: IT:Tag:shop=supermarket @@ -12303,11 +14566,16 @@ it: shop=wine: IT:Tag:shop=wine sport=balle_pelote: IT:Tag:sport=balle pelote sport=climbing: IT:Tag:sport=climbing + sport=hockey: IT:Tag:sport=hockey + sport=ice_hockey: IT:Tag:sport=ice hockey + sport=roller_hockey: IT:Tag:sport=roller hockey sport=surfing: IT:Tag:sport=surfing summit:cross=yes: IT:Tag:summit:cross=yes tourism=aquarium: IT:Tag:tourism=aquarium tourism=artwork: IT:Tag:tourism=artwork tourism=museum: IT:Tag:tourism=museum + vending=parking_tickets: IT:Tag:vending=parking tickets + vending=toll: IT:Tag:vending=toll waterway=ditch: IT:Tag:waterway=ditch waterway=river: IT:Tag:waterway=river waterway=stream: IT:Tag:waterway=stream @@ -12391,7 +14659,6 @@ ja: board_type: JA:Key:board type boat: JA:Key:boat bollard: JA:Key:bollard - booking: JA:Key:booking books: JA:Key:books border_type: JA:Key:border type both: JA:Key:both @@ -12438,7 +14705,6 @@ ja: capacity: JA:Key:capacity capacity:disabled: JA:Key:capacity:disabled capital: JA:Key:capital - car: JA:Key:car car_wash: JA:Key:car wash carriage: JA:Key:carriage castle_type: JA:Key:castle type @@ -12488,6 +14754,8 @@ ja: crossing_ref: JA:Key:crossing ref cuisine: JA:Key:cuisine currency: JA:Key:currency + currency:EUR: JA:Key:currency:EUR + currency:others: JA:Key:currency:others cutting: JA:Key:cutting cycle_network: JA:Key:cycle network cycleway: JA:Key:cycleway @@ -12561,7 +14829,9 @@ ja: floating: JA:Key:floating flood_mark: JA:Key:flood mark flood_prone: JA:Key:flood prone + food: JA:Key:food foot: JA:Key:foot + foot:backward: JA:Key:foot:backward footway: JA:Key:footway ford: JA:Key:ford forestry: JA:Key:forestry @@ -12668,6 +14938,7 @@ ja: lanes:psv: JA:Key:lanes:psv lanes:psv:backward: JA:Key:lanes:psv:backward lanes:psv:forward: JA:Key:lanes:psv:forward + language: JA:Key:language layer: JA:Key:layer lcn_ref: JA:Key:lcn ref leaf_cycle: JA:Key:leaf cycle @@ -12687,6 +14958,7 @@ ja: lock_name: JA:Key:lock name lockable: JA:Key:lockable lottery: JA:Key:lottery + lunch: JA:Key:lunch male: JA:Key:male man_made: JA:Key:man made managed: JA:Key:managed @@ -12741,12 +15013,14 @@ ja: name:cs: JA:Key:name:cs name:de: JA:Key:name:de name:en: JA:Key:name:en + name:etymology: JA:Key:name:etymology name:it: JA:Key:name:it name:ja: JA:Key:name:ja name:ja-Hira: JA:Key:name:ja-Hira name:ja-Latn: JA:Key:name:ja-Latn name:ja_kana: JA:Key:name:ja kana name:ja_rm: JA:Key:name:ja rm + name:kn:iso15919: JA:Key:name:kn:iso15919 name:left: JA:Key:name:left name:right: JA:Key:name:right narrow: JA:Key:narrow @@ -12754,6 +15028,7 @@ ja: natural: JA:Key:natural ncn_ref: JA:Key:ncn ref network: JA:Key:network + network:wikidata: JA:Key:network:wikidata noexit: JA:Key:noexit noname: JA:Key:noname noref: JA:Key:noref @@ -12768,10 +15043,13 @@ ja: old_ref: JA:Key:old ref oneway: JA:Key:oneway oneway:bicycle: JA:Key:oneway:bicycle + oneway:foot: JA:Key:oneway:foot openbenches:id: JA:Key:openbenches:id openfire: JA:Key:openfire opening_date: JA:Key:opening date opening_hours: JA:Key:opening hours + opening_hours/Tutorial: JA:Key:opening hours/Tutorial + opening_hours:covid19: JA:Key:opening hours:covid19 openplaques:id: JA:Key:openplaques:id operator: JA:Key:operator operator:ja: JA:Key:operator:ja @@ -12863,6 +15141,7 @@ ja: seats: JA:Key:seats second_hand: JA:Key:second hand segregated: JA:Key:segregated + self_checkout: JA:Key:self checkout self_service: JA:Key:self service service: JA:Key:service service_times: JA:Key:service times @@ -12897,6 +15176,7 @@ ja: source:ref: JA:Key:source:ref source_ref: JA:Key:source ref species: JA:Key:species + species:wikidata: JA:Key:species:wikidata speech_output: JA:Key:speech output sport: JA:Key:sport stamps: JA:Key:stamps @@ -13003,6 +15283,7 @@ ja: access=customers: JA:Tag:access=customers access=delivery: JA:Tag:access=delivery access=designated: JA:Tag:access=designated + access=destination: JA:Tag:access=destination access=forestry: JA:Tag:access=forestry access=license: JA:Tag:access=license access=no: JA:Tag:access=no @@ -13119,13 +15400,18 @@ ja: amenity=hunting_stand: JA:Tag:amenity=hunting stand amenity=ice_cream: JA:Tag:amenity=ice cream amenity=internet_cafe: JA:Tag:amenity=internet cafe + amenity=karaoke_box: JA:Tag:amenity=karaoke box amenity=kindergarten: JA:Tag:amenity=kindergarten amenity=language_school: JA:Tag:amenity=language school + amenity=letter_box: JA:Tag:amenity=letter box amenity=library: JA:Tag:amenity=library + amenity=loading_dock: JA:Tag:amenity=loading dock + amenity=lounger: JA:Tag:amenity=lounger amenity=love_hotel: JA:Tag:amenity=love hotel amenity=marketplace: JA:Tag:amenity=marketplace amenity=microwave: JA:Tag:amenity=microwave amenity=monastery: JA:Tag:amenity=monastery + amenity=money_transfer: JA:Tag:amenity=money transfer amenity=motorcycle_parking: JA:Tag:amenity=motorcycle parking amenity=music_school: JA:Tag:amenity=music school amenity=nightclub: JA:Tag:amenity=nightclub @@ -13151,6 +15437,7 @@ ja: amenity=public_building: JA:Tag:amenity=public building amenity=recycling: JA:Tag:amenity=recycling amenity=register_office: JA:Tag:amenity=register office + amenity=research_institute: JA:Tag:amenity=research institute amenity=restaurant: JA:Tag:amenity=restaurant amenity=retirement_home: JA:Tag:amenity=retirement home amenity=sanitary_dump_station: JA:Tag:amenity=sanitary dump station @@ -13158,6 +15445,7 @@ ja: amenity=school: JA:Tag:amenity=school amenity=shelter: JA:Tag:amenity=shelter amenity=shower: JA:Tag:amenity=shower + amenity=ski_school: JA:Tag:amenity=ski school amenity=smoking_area: JA:Tag:amenity=smoking area amenity=social_centre: JA:Tag:amenity=social centre amenity=social_facility: JA:Tag:amenity=social facility @@ -13264,6 +15552,7 @@ ja: building=civic: JA:Tag:building=civic building=college: JA:Tag:building=college building=commercial: JA:Tag:building=commercial + building=conservatory: JA:Tag:building=conservatory building=construction: JA:Tag:building=construction building=cowshed: JA:Tag:building=cowshed building=detached: JA:Tag:building=detached @@ -13289,12 +15578,15 @@ ja: building=public: JA:Tag:building=public building=residential: JA:Tag:building=residential building=retail: JA:Tag:building=retail + building=riding_hall: JA:Tag:building=riding hall building=roof: JA:Tag:building=roof building=ruins: JA:Tag:building=ruins building=school: JA:Tag:building=school building=service: JA:Tag:building=service building=shed: JA:Tag:building=shed building=shrine: JA:Tag:building=shrine + building=sports_centre: JA:Tag:building=sports centre + building=sports_hall: JA:Tag:building=sports hall building=stable: JA:Tag:building=stable building=stadium: JA:Tag:building=stadium building=static_caravan: JA:Tag:building=static caravan @@ -13308,6 +15600,7 @@ ja: building=transportation: JA:Tag:building=transportation building=university: JA:Tag:building=university building=warehouse: JA:Tag:building=warehouse + bus=no: JA:Tag:bus=no busway=opposite_lane: JA:Tag:busway=opposite lane castle_type=fortress: JA:Tag:castle type=fortress cemetery=grave: JA:Tag:cemetery=grave @@ -13388,6 +15681,9 @@ ja: emergency=ambulance_station: JA:Tag:emergency=ambulance station emergency=assembly_point: JA:Tag:emergency=assembly point emergency=defibrillator: JA:Tag:emergency=defibrillator + emergency=dry_riser_inlet: JA:Tag:emergency=dry riser inlet + emergency=emergency_ward_entrance: JA:Tag:emergency=emergency ward entrance + emergency=fire_alarm_box: JA:Tag:emergency=fire alarm box emergency=fire_extinguisher: JA:Tag:emergency=fire extinguisher emergency=fire_hose: JA:Tag:emergency=fire hose emergency=fire_hydrant: JA:Tag:emergency=fire hydrant @@ -13396,6 +15692,7 @@ ja: emergency=phone: JA:Tag:emergency=phone emergency=siren: JA:Tag:emergency=siren emergency=water_tank: JA:Tag:emergency=water tank + entrance=main: JA:Tag:entrance=main entrance=staircase: JA:Tag:entrance=staircase foot=designated: JA:Tag:foot=designated foot=private: JA:Tag:foot=private @@ -13453,6 +15750,7 @@ ja: golf=bunker: JA:Tag:golf=bunker golf=driving_range: JA:Tag:golf=driving range golf=fairway: JA:Tag:golf=fairway + goods=destination: JA:Tag:goods=destination government=ministry: JA:Tag:government=ministry government=prosecutor: JA:Tag:government=prosecutor government=register_office: JA:Tag:government=register office @@ -13460,6 +15758,7 @@ ja: guidepost=simple: JA:Tag:guidepost=simple healthcare=blood_donation: JA:Tag:healthcare=blood donation hgv=designated: JA:Tag:hgv=designated + hgv=destination: JA:Tag:hgv=destination highway=bridleway: JA:Tag:highway=bridleway highway=bus_guideway: JA:Tag:highway=bus guideway highway=bus_stop: JA:Tag:highway=bus stop @@ -13478,6 +15777,7 @@ ja: highway=motorway: JA:Tag:highway=motorway highway=motorway_junction: JA:Tag:highway=motorway junction highway=motorway_link: JA:Tag:highway=motorway link + highway=no: JA:Tag:highway=no highway=passing_place: JA:Tag:highway=passing place highway=path: JA:Tag:highway=path highway=pedestrian: JA:Tag:highway=pedestrian @@ -13509,6 +15809,7 @@ ja: historic=boundary_stone: JA:Tag:historic=boundary stone historic=cannon: JA:Tag:historic=cannon historic=castle: JA:Tag:historic=castle + historic=charcoal_pile: JA:Tag:historic=charcoal pile historic=city_gate: JA:Tag:historic=city gate historic=citywalls: JA:Tag:historic=citywalls historic=farm: JA:Tag:historic=farm @@ -13575,6 +15876,7 @@ ja: landuse=churchyard: JA:Tag:landuse=churchyard landuse=commercial: JA:Tag:landuse=commercial landuse=construction: JA:Tag:landuse=construction + landuse=depot: JA:Tag:landuse=depot landuse=farm: JA:Tag:landuse=farm landuse=farmland: JA:Tag:landuse=farmland landuse=farmyard: JA:Tag:landuse=farmyard @@ -13603,6 +15905,7 @@ ja: landuse=traffic_island: JA:Tag:landuse=traffic island landuse=village_green: JA:Tag:landuse=village green landuse=vineyard: JA:Tag:landuse=vineyard + landuse=winter_sports: JA:Tag:landuse=winter sports landuse=wood: JA:Tag:landuse=wood leaf_cycle=deciduous: JA:Tag:leaf cycle=deciduous leaf_cycle=evergreen: JA:Tag:leaf cycle=evergreen @@ -13641,12 +15944,15 @@ ja: leisure=sauna: JA:Tag:leisure=sauna leisure=slipway: JA:Tag:leisure=slipway leisure=sports_centre: JA:Tag:leisure=sports centre + leisure=sports_hall: JA:Tag:leisure=sports hall leisure=stadium: JA:Tag:leisure=stadium leisure=summer_camp: JA:Tag:leisure=summer camp leisure=swimming_area: JA:Tag:leisure=swimming area leisure=swimming_pool: JA:Tag:leisure=swimming pool leisure=track: JA:Tag:leisure=track leisure=water_park: JA:Tag:leisure=water park + line=bay: JA:Tag:line=bay + line=busbar: JA:Tag:line=busbar man_made=adit: JA:Tag:man made=adit man_made=beacon: JA:Tag:man made=beacon man_made=breakwater: JA:Tag:man made=breakwater @@ -13702,6 +16008,7 @@ ja: man_made=windpump: JA:Tag:man made=windpump man_made=works: JA:Tag:man made=works manhole=telecom: JA:Tag:manhole=telecom + memorial=stele: JA:Tag:memorial=stele microbrewery=yes: JA:Tag:microbrewery=yes military=airfield: JA:Tag:military=airfield military=ammunition: JA:Tag:military=ammunition @@ -13711,7 +16018,13 @@ ja: military=naval_base: JA:Tag:military=naval base military=office: JA:Tag:military=office military=range: JA:Tag:military=range + military=training_area: JA:Tag:military=training area military=trench: JA:Tag:military=trench + mofa=destination: JA:Tag:mofa=destination + moped=destination: JA:Tag:moped=destination + motor_vehicle=destination: JA:Tag:motor vehicle=destination + motorcar=destination: JA:Tag:motorcar=destination + motorcycle=destination: JA:Tag:motorcycle=destination natural=anthill: JA:Tag:natural=anthill natural=arete: JA:Tag:natural=arete natural=bare_rock: JA:Tag:natural=bare rock @@ -13783,6 +16096,10 @@ ja: office=research: JA:Tag:office=research office=tax_advisor: JA:Tag:office=tax advisor office=telecommunication: JA:Tag:office=telecommunication + oneway=alternating: JA:Tag:oneway=alternating + oneway=reversible: JA:Tag:oneway=reversible + parking=layby: JA:Tag:parking=layby + parking=street_side: JA:Tag:parking=street side parking=surface: JA:Tag:parking=surface place=archipelago: JA:Tag:place=archipelago place=city: JA:Tag:place=city @@ -13803,6 +16120,7 @@ ja: place=suburb: JA:Tag:place=suburb place=town: JA:Tag:place=town place=village: JA:Tag:place=village + plant:method=photovoltaic: JA:Tag:plant:method=photovoltaic power=catenary_mast: JA:Tag:power=catenary mast power=compensator: JA:Tag:power=compensator power=generator: JA:Tag:power=generator @@ -13814,6 +16132,7 @@ ja: power=station: JA:Tag:power=station power=sub_station: JA:Tag:power=sub station power=substation: JA:Tag:power=substation + power=switchgear: JA:Tag:power=switchgear power=tower: JA:Tag:power=tower power=transformer: JA:Tag:power=transformer public_transport=platform: JA:Tag:public transport=platform @@ -13852,6 +16171,7 @@ ja: railway=traverser: JA:Tag:railway=traverser railway=turntable: JA:Tag:railway=turntable railway=yard: JA:Tag:railway=yard + reclaimed=yes: JA:Tag:reclaimed=yes recycling_type=container: JA:Tag:recycling type=container religion=buddhist: JA:Tag:religion=buddhist religion=christian: JA:Tag:religion=christian @@ -13943,6 +16263,7 @@ ja: shop=florist: JA:Tag:shop=florist shop=frame: JA:Tag:shop=frame shop=frozen_food: JA:Tag:shop=frozen food + shop=fuel: JA:Tag:shop=fuel shop=funeral_directors: JA:Tag:shop=funeral directors shop=furniture: JA:Tag:shop=furniture shop=gambling: JA:Tag:shop=gambling @@ -14006,6 +16327,7 @@ ja: shop=pyrotechnics: JA:Tag:shop=pyrotechnics shop=radiotechnics: JA:Tag:shop=radiotechnics shop=religion: JA:Tag:shop=religion + shop=rice: JA:Tag:shop=rice shop=scuba_diving: JA:Tag:shop=scuba diving shop=seafood: JA:Tag:shop=seafood shop=second_hand: JA:Tag:shop=second hand @@ -14041,6 +16363,7 @@ ja: shop=wine: JA:Tag:shop=wine shop=wool: JA:Tag:shop=wool shop=yes: JA:Tag:shop=yes + shop=園芸店: JA:Tag:shop=園芸店 ski=designated: JA:Tag:ski=designated snowmobile=designated: JA:Tag:snowmobile=designated social_facility=ambulatory_care: JA:Tag:social facility=ambulatory care @@ -14102,6 +16425,8 @@ ja: traffic_sign=city_limit: JA:Tag:traffic sign=city limit tunnel=culvert: JA:Tag:tunnel=culvert type=public_transport: JA:Tag:type=public transport + type=waterway: JA:Tag:type=waterway + vehicle=destination: JA:Tag:vehicle=destination vending=bread: JA:Tag:vending=bread vending=excrement_bags: JA:Tag:vending=excrement bags vending=fuel: JA:Tag:vending=fuel @@ -14134,7 +16459,6 @@ ja: waterway=milestone: JA:Tag:waterway=milestone waterway=offshore_field: JA:Tag:waterway=offshore field waterway=river: JA:Tag:waterway=river - waterway=riverbank: JA:Tag:waterway=riverbank waterway=seaway: JA:Tag:waterway=seaway waterway=stream: JA:Tag:waterway=stream waterway=turning_point: JA:Tag:waterway=turning point @@ -14153,9 +16477,11 @@ ja: wetland=wet_meadow: JA:Tag:wetland=wet meadow ko: key: + addr: Ko:Key:addr aerialway: Ko:Key:aerialway amenity: Ko:Key:amenity crossing: Ko:Key:crossing + denotation: Ko:Key:denotation drink: Ko:Key:drink ele: Ko:Key:ele emergency: Ko:Key:emergency @@ -14181,6 +16507,7 @@ ko: access=designated: Ko:Tag:access=designated aerialway=cable_car: Ko:Tag:aerialway=cable car amenity=fuel: Ko:Tag:amenity=fuel + amenity=prep_school: Ko:Tag:amenity=prep school amenity=taxi: Ko:Tag:amenity=taxi amenity=townhall: Ko:Tag:amenity=townhall barrier=kerb: Ko:Tag:barrier=kerb @@ -14208,6 +16535,7 @@ ko: man_made=surveillance: Ko:Tag:man made=surveillance natural=grassland: Ko:Tag:natural=grassland natural=spring: Ko:Tag:natural=spring + natural=tree: Ko:Tag:natural=tree place=hamlet: Ko:Tag:place=hamlet place=town: Ko:Tag:place=town shop=convenience: Ko:Tag:shop=convenience @@ -14215,6 +16543,7 @@ ko: shop=garden_centre: Ko:Tag:shop=garden centre shop=gift: Ko:Tag:shop=gift tourism=attraction: Ko:Tag:tourism=attraction + waterway=ditch: Ko:Tag:waterway=ditch lt: key: cycleway: Lt:Key:cycleway @@ -14235,6 +16564,8 @@ my: tag: craft=agricultural_engines: My:Tag:craft=agricultural engines ne: + key: + tracktype: Ne:Key:tracktype tag: landuse=meadow: Ne:Tag:landuse=meadow natural=scrub: Ne:Tag:natural=scrub @@ -14260,11 +16591,14 @@ nl: colour: NL:Key:colour craft: NL:Key:craft crossing: NL:Key:crossing + cyclestreet: NL:Key:cyclestreet cycleway: NL:Key:cycleway demolished: NL:Key:demolished + dog: NL:Key:dog emergency: NL:Key:emergency fence_type: NL:Key:fence type fenced: NL:Key:fenced + from: NL:Key:from internet_access: NL:Key:internet access landuse: NL:Key:landuse leaf_cycle: NL:Key:leaf cycle @@ -14273,6 +16607,8 @@ nl: military: NL:Key:military name: NL:Key:name natural: NL:Key:natural + network: NL:Key:network + network:type: NL:Key:network:type office: NL:Key:office place: NL:Key:place population: NL:Key:population @@ -14280,11 +16616,11 @@ nl: public_transport: NL:Key:public transport ref:bag: NL:Key:ref:bag ref:bag:old: NL:Key:ref:bag:old - religion: NL:Key:religion route_master: NL:Key:route master scenic: NL:Key:scenic shop: NL:Key:shop surface: NL:Key:surface + to: NL:Key:to tourism: NL:Key:tourism tracktype: NL:Key:tracktype turn: NL:Key:turn @@ -14292,6 +16628,7 @@ nl: type: NL:Key:type waste: NL:Key:waste wheelchair: NL:Key:wheelchair + xmas:feature: NL:Key:xmas:feature tag: amenity=bank: NL:Tag:amenity=bank amenity=bench: NL:Tag:amenity=bench @@ -14314,6 +16651,7 @@ nl: highway=footway: NL:Tag:highway=footway highway=motorway: NL:Tag:highway=motorway highway=path: NL:Tag:highway=path + highway=trailhead: NL:Tag:highway=trailhead historic=monument: NL:Tag:historic=monument information=tactile_map: NL:Tag:information=tactile map landuse=cemetery: NL:Tag:landuse=cemetery @@ -14333,7 +16671,17 @@ nl: shop=department_store: NL:Tag:shop=department store shop=greengrocer: NL:Tag:shop=greengrocer shop=motorcycle: NL:Tag:shop=motorcycle + sport=floorball: NL:Tag:sport=floorball + sport=miniature_golf: NL:Tag:sport=miniature golf + sport=squash: NL:Tag:sport=squash tourism=chalet: NL:Tag:tourism=chalet + traffic_sign=NL:A01-30-ZB: NL:Tag:traffic sign=NL:A01-30-ZB + traffic_sign=NL:C15: NL:Tag:traffic sign=NL:C15 + traffic_sign=NL:G07: NL:Tag:traffic sign=NL:G07 + traffic_sign=NL:G11: NL:Tag:traffic sign=NL:G11 + traffic_sign=NL:G12a: NL:Tag:traffic sign=NL:G12a + traffic_sign=NL:G13: NL:Tag:traffic sign=NL:G13 + vending=bottle_return: NL:Tag:vending=bottle return vending=parking_tickets: NL:Tag:vending=parking tickets zoo=petting_zoo: NL:Tag:zoo=petting zoo no: @@ -14346,7 +16694,6 @@ no: maxheight:legal: No:Key:maxheight:legal maxheight:marine: No:Key:maxheight:marine maxheight:physical: No:Key:maxheight:physical - religion: No:Key:religion room: No:Key:room tag: amenity=bank: No:Tag:amenity=bank @@ -14416,6 +16763,7 @@ pl: barrier: Pl:Key:barrier basin: Pl:Key:basin bath:type: Pl:Key:bath:type + beauty: Pl:Key:beauty beds: Pl:Key:beds bell_tower: Pl:Key:bell tower bench: Pl:Key:bench @@ -14436,6 +16784,7 @@ pl: budynek: Pl:Key:budynek building: Pl:Key:building building:architecture: Pl:Key:building:architecture + building:colour: Pl:Key:building:colour building:condition: Pl:Key:building:condition building:cullis:height: Pl:Key:building:cullis:height building:flats: Pl:Key:building:flats @@ -14459,6 +16808,7 @@ pl: check_date: Pl:Key:check date circuits: Pl:Key:circuits circumference: Pl:Key:circumference + clothes: Pl:Key:clothes club: Pl:Key:club colour: Pl:Key:colour comment: Pl:Key:comment @@ -14486,8 +16836,10 @@ pl: cutting: Pl:Key:cutting cycleway: Pl:Key:cycleway deanery: Pl:Key:deanery + delivery: Pl:Key:delivery denomination: Pl:Key:denomination denotation: Pl:Key:denotation + departures_board: Pl:Key:departures board depth: Pl:Key:depth description: Pl:Key:description designation: Pl:Key:designation @@ -14519,12 +16871,14 @@ pl: entrance: Pl:Key:entrance est_width: Pl:Key:est width fair_trade: Pl:Key:fair trade + farmyard: Pl:Key:farmyard fee: Pl:Key:fee female: Pl:Key:female fence_type: Pl:Key:fence type field: Pl:Key:field fire_boundary: Pl:Key:fire boundary fire_hydrant: Pl:Key:fire hydrant + fire_path: Pl:Key:fire path fishing: Pl:Key:fishing fixme: Pl:Key:fixme floating: Pl:Key:floating @@ -14543,8 +16897,10 @@ pl: gauge: Pl:Key:gauge generator:output: Pl:Key:generator:output genus: Pl:Key:genus + genus:pl: Pl:Key:genus:pl geological: Pl:Key:geological government: Pl:Key:government + grades: Pl:Key:grades handrail: Pl:Key:handrail healthcare: Pl:Key:healthcare healthcare:speciality: Pl:Key:healthcare:speciality @@ -14554,7 +16910,6 @@ pl: highway: Pl:Key:highway highway:category:pl: Pl:Key:highway:category:pl highway:class:pl: Pl:Key:highway:class:pl - highway_(propozycja_zmian): Pl:Key:highway (propozycja zmian) historic: Pl:Key:historic historic:civilization: Pl:Key:historic:civilization historic:era: Pl:Key:historic:era @@ -14607,6 +16962,7 @@ pl: location: Pl:Key:location lock: Pl:Key:lock lock_name: Pl:Key:lock name + lottery: Pl:Key:lottery male: Pl:Key:male man_made: Pl:Key:man made manhole: Pl:Key:manhole @@ -14660,13 +17016,17 @@ pl: operator: Pl:Key:operator operator:type: Pl:Key:operator:type organic: Pl:Key:organic + origin: Pl:Key:origin + outdoor_seating: Pl:Key:outdoor seating overtaking: Pl:Key:overtaking owner: Pl:Key:owner ownership: Pl:Key:ownership parish: Pl:Key:parish parking: Pl:Key:parking parking:lane: Pl:Key:parking:lane + passenger_information_display: Pl:Key:passenger information display passing_places: Pl:Key:passing places + payment: Pl:Key:payment pipeline: Pl:Key:pipeline place: Pl:Key:place place_name: Pl:Key:place name @@ -14698,9 +17058,12 @@ pl: 'removed:': 'Pl:Key:removed:' repair: Pl:Key:repair repeat_on: Pl:Key:repeat on + reservation: Pl:Key:reservation residential: Pl:Key:residential resource: Pl:Key:resource + roof:colour: Pl:Key:roof:colour roof:material: Pl:Key:roof:material + roof:shape: Pl:Key:roof:shape room: Pl:Key:room route: Pl:Key:route route_master: Pl:Key:route master @@ -14729,6 +17092,7 @@ pl: source:date: Pl:Key:source:date source:maxspeed: Pl:Key:source:maxspeed species: Pl:Key:species + species:pl: Pl:Key:species:pl sport: Pl:Key:sport stairs: Pl:Key:stairs start_date: Pl:Key:start date @@ -14745,6 +17109,7 @@ pl: surveillance:zone: Pl:Key:surveillance:zone symbol: Pl:Key:symbol tactile_paving: Pl:Key:tactile paving + takeaway: Pl:Key:takeaway target: Pl:Key:target taxon: Pl:Key:taxon tents: Pl:Key:tents @@ -14829,6 +17194,7 @@ pl: amenity=administration: Pl:Tag:amenity=administration amenity=animal_boarding: Pl:Tag:amenity=animal boarding amenity=archive: Pl:Tag:amenity=archive + amenity=arts_centre: Pl:Tag:amenity=arts centre amenity=atm: Pl:Tag:amenity=atm amenity=audiologist: Pl:Tag:amenity=audiologist amenity=baby_hatch: Pl:Tag:amenity=baby hatch @@ -14847,6 +17213,7 @@ pl: amenity=bus_station: Pl:Tag:amenity=bus station amenity=cafe: Pl:Tag:amenity=cafe amenity=car_pooling: Pl:Tag:amenity=car pooling + amenity=car_rental: Pl:Tag:amenity=car rental amenity=car_wash: Pl:Tag:amenity=car wash amenity=casino: Pl:Tag:amenity=casino amenity=charging_station: Pl:Tag:amenity=charging station @@ -14937,6 +17304,8 @@ pl: amenity=refugee_housing: Pl:Tag:amenity=refugee housing amenity=research_institute: Pl:Tag:amenity=research institute amenity=restaurant: Pl:Tag:amenity=restaurant + amenity=retirement_home: Pl:Tag:amenity=retirement home + amenity=sanatorium: Pl:Tag:amenity=sanatorium amenity=sanitary_dump_station: Pl:Tag:amenity=sanitary dump station amenity=sauna: Pl:Tag:amenity=sauna amenity=school: Pl:Tag:amenity=school @@ -14956,6 +17325,7 @@ pl: amenity=toilets: Pl:Tag:amenity=toilets amenity=tourist_bus_parking: Pl:Tag:amenity=tourist bus parking amenity=townhall: Pl:Tag:amenity=townhall + amenity=trolley_bay: Pl:Tag:amenity=trolley bay amenity=university: Pl:Tag:amenity=university amenity=vacuum_cleaner: Pl:Tag:amenity=vacuum cleaner amenity=vehicle_inspection: Pl:Tag:amenity=vehicle inspection @@ -14971,6 +17341,7 @@ pl: area:highway=footway: Pl:Tag:area:highway=footway area:highway=path: Pl:Tag:area:highway=path area:highway=pedestrian: Pl:Tag:area:highway=pedestrian + artwork_type=dwarf: Pl:Tag:artwork type=dwarf artwork_type=sculpture: Pl:Tag:artwork type=sculpture artwork_type=statue: Pl:Tag:artwork type=statue atm=no: Pl:Tag:atm=no @@ -14981,6 +17352,7 @@ pl: barrier=block: Pl:Tag:barrier=block barrier=bollard: Pl:Tag:barrier=bollard barrier=bus_trap: Pl:Tag:barrier=bus trap + barrier=cable_barrier: Pl:Tag:barrier=cable barrier barrier=cattle_grid: Pl:Tag:barrier=cattle grid barrier=chain: Pl:Tag:barrier=chain barrier=city_wall: Pl:Tag:barrier=city wall @@ -14993,6 +17365,7 @@ pl: barrier=handrail: Pl:Tag:barrier=handrail barrier=hedge: Pl:Tag:barrier=hedge barrier=height_restrictor: Pl:Tag:barrier=height restrictor + barrier=jersey_barrier: Pl:Tag:barrier=jersey barrier barrier=kerb: Pl:Tag:barrier=kerb barrier=lift_gate: Pl:Tag:barrier=lift gate barrier=retaining_wall: Pl:Tag:barrier=retaining wall @@ -15053,6 +17426,7 @@ pl: building=chapel: Pl:Tag:building=chapel building=church: Pl:Tag:building=church building=civic: Pl:Tag:building=civic + building=collapsed: Pl:Tag:building=collapsed building=college: Pl:Tag:building=college building=commercial: Pl:Tag:building=commercial building=conservatory: Pl:Tag:building=conservatory @@ -15174,7 +17548,6 @@ pl: cycleway=opposite_track: Pl:Tag:cycleway=opposite track cycleway=share_busway: Pl:Tag:cycleway=share busway cycleway=track: Pl:Tag:cycleway=track - emergency=aed: Pl:Tag:emergency=aed emergency=ambulance_station: Pl:Tag:emergency=ambulance station emergency=defibrillator: Pl:Tag:emergency=defibrillator emergency=emergency_ward_entrance: Pl:Tag:emergency=emergency ward entrance @@ -15194,14 +17567,20 @@ pl: emergency=water_rescue_station: Pl:Tag:emergency=water rescue station emergency=water_tank: Pl:Tag:emergency=water tank entrance=main: Pl:Tag:entrance=main + fast_food=cafeteria: Pl:Tag:fast food=cafeteria footway=crossing: Pl:Tag:footway=crossing footway=sidewalk: Pl:Tag:footway=sidewalk ford=stepping_stones: Pl:Tag:ford=stepping stones garden:type=botanical: Pl:Tag:garden:type=botanical geological=moraine: Pl:Tag:geological=moraine + government=customs: Pl:Tag:government=customs government=ministry: Pl:Tag:government=ministry government=prosecutor: Pl:Tag:government=prosecutor + healthcare=dentist: Pl:Tag:healthcare=dentist + healthcare=dialysis: Pl:Tag:healthcare=dialysis healthcare=laboratory: Pl:Tag:healthcare=laboratory + healthcare=nutrition_counselling: Pl:Tag:healthcare=nutrition counselling + healthcare=physiotherapist: Pl:Tag:healthcare=physiotherapist highway=abandoned: Pl:Tag:highway=abandoned highway=bridleway: Pl:Tag:highway=bridleway highway=bus_guideway: Pl:Tag:highway=bus guideway @@ -15322,6 +17701,7 @@ pl: landuse=greenfield: Pl:Tag:landuse=greenfield landuse=greenhouse_horticulture: Pl:Tag:landuse=greenhouse horticulture landuse=industrial: Pl:Tag:landuse=industrial + landuse=institutional: Pl:Tag:landuse=institutional landuse=landfill: Pl:Tag:landuse=landfill landuse=meadow: Pl:Tag:landuse=meadow landuse=military: Pl:Tag:landuse=military @@ -15504,6 +17884,7 @@ pl: military=training_area: Pl:Tag:military=training area military=trench: Pl:Tag:military=trench mooring=ferry: Pl:Tag:mooring=ferry + natural=anthill: Pl:Tag:natural=anthill natural=arete: Pl:Tag:natural=arete natural=avalanche_dam: Pl:Tag:natural=avalanche dam natural=bare_rock: Pl:Tag:natural=bare rock @@ -15696,6 +18077,7 @@ pl: residential=rural: Pl:Tag:residential=rural residential=university: Pl:Tag:residential=university residential=urban: Pl:Tag:residential=urban + route=emergency_access: Pl:Tag:route=emergency access route=hiking: Pl:Tag:route=hiking route=horse: Pl:Tag:route=horse route=running: Pl:Tag:route=running @@ -15710,7 +18092,10 @@ pl: service=yard: Pl:Tag:service=yard shop=agrarian: Pl:Tag:shop=agrarian shop=alcohol: Pl:Tag:shop=alcohol + shop=anime: Pl:Tag:shop=anime + shop=antiques: Pl:Tag:shop=antiques shop=appliance: Pl:Tag:shop=appliance + shop=art: Pl:Tag:shop=art shop=baby_goods: Pl:Tag:shop=baby goods shop=bag: Pl:Tag:shop=bag shop=bakery: Pl:Tag:shop=bakery @@ -15719,81 +18104,159 @@ pl: shop=bed: Pl:Tag:shop=bed shop=beverages: Pl:Tag:shop=beverages shop=bicycle: Pl:Tag:shop=bicycle + shop=boat: Pl:Tag:shop=boat + shop=bookmaker: Pl:Tag:shop=bookmaker + shop=books: Pl:Tag:shop=books shop=boutique: Pl:Tag:shop=boutique shop=brewing_supplies: Pl:Tag:shop=brewing supplies shop=butcher: Pl:Tag:shop=butcher shop=camera: Pl:Tag:shop=camera + shop=candles: Pl:Tag:shop=candles + shop=cannabis: Pl:Tag:shop=cannabis shop=car: Pl:Tag:shop=car + shop=car_parts: Pl:Tag:shop=car parts shop=car_repair: Pl:Tag:shop=car repair + shop=caravan: Pl:Tag:shop=caravan + shop=carpet: Pl:Tag:shop=carpet + shop=charity: Pl:Tag:shop=charity shop=cheese: Pl:Tag:shop=cheese + shop=chemist: Pl:Tag:shop=chemist shop=chocolate: Pl:Tag:shop=chocolate shop=clothes: Pl:Tag:shop=clothes shop=coffee: Pl:Tag:shop=coffee shop=collector: Pl:Tag:shop=collector + shop=computer: Pl:Tag:shop=computer shop=confectionery: Pl:Tag:shop=confectionery shop=convenience: Pl:Tag:shop=convenience shop=copyshop: Pl:Tag:shop=copyshop + shop=cosmetics: Pl:Tag:shop=cosmetics + shop=country_store: Pl:Tag:shop=country store + shop=craft: Pl:Tag:shop=craft shop=curtain: Pl:Tag:shop=curtain shop=dairy: Pl:Tag:shop=dairy shop=deli: Pl:Tag:shop=deli shop=department_store: Pl:Tag:shop=department store shop=doityourself: Pl:Tag:shop=doityourself + shop=doors: Pl:Tag:shop=doors shop=dry_cleaning: Pl:Tag:shop=dry cleaning + shop=e-cigarette: Pl:Tag:shop=e-cigarette + shop=electrical: Pl:Tag:shop=electrical + shop=electronics: Pl:Tag:shop=electronics shop=equestrian: Pl:Tag:shop=equestrian shop=erotic: Pl:Tag:shop=erotic shop=fabric: Pl:Tag:shop=fabric shop=farm: Pl:Tag:shop=farm + shop=fashion_accessories: Pl:Tag:shop=fashion accessories + shop=fireplace: Pl:Tag:shop=fireplace shop=fishing: Pl:Tag:shop=fishing shop=fishmonger: Pl:Tag:shop=fishmonger + shop=flooring: Pl:Tag:shop=flooring shop=florist: Pl:Tag:shop=florist + shop=frame: Pl:Tag:shop=frame + shop=frozen_food: Pl:Tag:shop=frozen food + shop=fuel: Pl:Tag:shop=fuel shop=funeral_directors: Pl:Tag:shop=funeral directors shop=furniture: Pl:Tag:shop=furniture + shop=games: Pl:Tag:shop=games shop=garden_centre: Pl:Tag:shop=garden centre shop=gas: Pl:Tag:shop=gas shop=general: Pl:Tag:shop=general + shop=gift: Pl:Tag:shop=gift + shop=golf: Pl:Tag:shop=golf shop=greengrocer: Pl:Tag:shop=greengrocer shop=haberdashery: Pl:Tag:shop=haberdashery shop=hairdresser: Pl:Tag:shop=hairdresser + shop=hairdresser_supply: Pl:Tag:shop=hairdresser supply + shop=hardware: Pl:Tag:shop=hardware shop=health_food: Pl:Tag:shop=health food + shop=hearing_aids: Pl:Tag:shop=hearing aids shop=herbalist: Pl:Tag:shop=herbalist + shop=hifi: Pl:Tag:shop=hifi + shop=honey: Pl:Tag:shop=honey + shop=household_linen: Pl:Tag:shop=household linen shop=houseware: Pl:Tag:shop=houseware shop=hunting: Pl:Tag:shop=hunting + shop=hvac: Pl:Tag:shop=hvac shop=ice_cream: Pl:Tag:shop=ice cream + shop=interior_decoration: Pl:Tag:shop=interior decoration + shop=jewelry: Pl:Tag:shop=jewelry shop=junk_yard: Pl:Tag:shop=junk yard shop=kiosk: Pl:Tag:shop=kiosk shop=kitchen: Pl:Tag:shop=kitchen shop=laundry: Pl:Tag:shop=laundry shop=leather: Pl:Tag:shop=leather shop=lighting: Pl:Tag:shop=lighting + shop=locksmith: Pl:Tag:shop=locksmith + shop=lottery: Pl:Tag:shop=lottery shop=mall: Pl:Tag:shop=mall + shop=massage: Pl:Tag:shop=massage shop=medical_supply: Pl:Tag:shop=medical supply + shop=military_surplus: Pl:Tag:shop=military surplus + shop=mobile_phone: Pl:Tag:shop=mobile phone + shop=model: Pl:Tag:shop=model + shop=money_lender: Pl:Tag:shop=money lender + shop=motorcycle: Pl:Tag:shop=motorcycle + shop=motorcycle_repair: Pl:Tag:shop=motorcycle repair + shop=music: Pl:Tag:shop=music shop=musical_instrument: Pl:Tag:shop=musical instrument + shop=newsagent: Pl:Tag:shop=newsagent shop=nutrition_supplements: Pl:Tag:shop=nutrition supplements shop=optician: Pl:Tag:shop=optician + shop=outdoor: Pl:Tag:shop=outdoor + shop=outpost: Pl:Tag:shop=outpost + shop=paint: Pl:Tag:shop=paint + shop=party: Pl:Tag:shop=party shop=pastry: Pl:Tag:shop=pastry + shop=pawnbroker: Pl:Tag:shop=pawnbroker + shop=perfumery: Pl:Tag:shop=perfumery shop=pet: Pl:Tag:shop=pet shop=pet_grooming: Pl:Tag:shop=pet grooming + shop=photo: Pl:Tag:shop=photo shop=pottery: Pl:Tag:shop=pottery + shop=printer_ink: Pl:Tag:shop=printer ink shop=pyrotechnics: Pl:Tag:shop=pyrotechnics + shop=radiotechnics: Pl:Tag:shop=radiotechnics shop=religion: Pl:Tag:shop=religion shop=rental: Pl:Tag:shop=rental + shop=scuba_diving: Pl:Tag:shop=scuba diving shop=seafood: Pl:Tag:shop=seafood shop=second_hand: Pl:Tag:shop=second hand shop=sewing: Pl:Tag:shop=sewing + shop=shoe_repair: Pl:Tag:shop=shoe repair shop=shoes: Pl:Tag:shop=shoes + shop=ski: Pl:Tag:shop=ski shop=spices: Pl:Tag:shop=spices + shop=sports: Pl:Tag:shop=sports shop=stationery: Pl:Tag:shop=stationery + shop=storage_rental: Pl:Tag:shop=storage rental shop=supermarket: Pl:Tag:shop=supermarket + shop=surf: Pl:Tag:shop=surf + shop=swimming_pool: Pl:Tag:shop=swimming pool + shop=tailor: Pl:Tag:shop=tailor shop=tattoo: Pl:Tag:shop=tattoo shop=tea: Pl:Tag:shop=tea shop=ticket: Pl:Tag:shop=ticket + shop=tiles: Pl:Tag:shop=tiles + shop=tobacco: Pl:Tag:shop=tobacco + shop=tool_hire: Pl:Tag:shop=tool hire + shop=toys: Pl:Tag:shop=toys + shop=trade: Pl:Tag:shop=trade shop=travel_agency: Pl:Tag:shop=travel agency + shop=trophy: Pl:Tag:shop=trophy shop=tyres: Pl:Tag:shop=tyres shop=vacant: Pl:Tag:shop=vacant + shop=vacuum_cleaner: Pl:Tag:shop=vacuum cleaner shop=variety_store: Pl:Tag:shop=variety store + shop=video: Pl:Tag:shop=video + shop=video_games: Pl:Tag:shop=video games + shop=watches: Pl:Tag:shop=watches shop=water: Pl:Tag:shop=water + shop=weapons: Pl:Tag:shop=weapons shop=wholesale: Pl:Tag:shop=wholesale + shop=wigs: Pl:Tag:shop=wigs + shop=window_blind: Pl:Tag:shop=window blind shop=wine: Pl:Tag:shop=wine + shop=wool: Pl:Tag:shop=wool shop=yes: Pl:Tag:shop=yes site_type=bigstone: Pl:Tag:site type=bigstone site_type=city: Pl:Tag:site type=city @@ -15957,6 +18420,7 @@ pt: boundary: Pt:Key:boundary bridge: Pt:Key:bridge building: Pt:Key:building + building:flats: Pt:Key:building:flats building:levels: Pt:Key:building:levels building:material: Pt:Key:building:material building:min_level: Pt:Key:building:min level @@ -15964,6 +18428,7 @@ pt: button_operated: Pt:Key:button operated cables: Pt:Key:cables capacity: Pt:Key:capacity + charge: Pt:Key:charge construction: Pt:Key:construction contact: Pt:Key:contact country: Pt:Key:country @@ -15974,10 +18439,12 @@ pt: cutting: Pt:Key:cutting cycleway: Pt:Key:cycleway denomination: Pt:Key:denomination + description: Pt:Key:description diet:*: Pt:Key:diet:* diet:vegan: Pt:Key:diet:vegan dispensing: Pt:Key:dispensing display: Pt:Key:display + drinking_water: Pt:Key:drinking water drive_through: Pt:Key:drive through driving_side: Pt:Key:driving side ele: Pt:Key:ele @@ -15986,11 +18453,16 @@ pt: emergency: Pt:Key:emergency fence_type: Pt:Key:fence type fenced: Pt:Key:fenced + ferry: Pt:Key:ferry fishing: Pt:Key:fishing + fixme: Pt:Key:fixme foot: Pt:Key:foot frequency: Pt:Key:frequency + garden:style: Pt:Key:garden:style + garden:type: Pt:Key:garden:type generator:method: Pt:Key:generator:method geological: Pt:Key:geological + grades: Pt:Key:grades group_only: Pt:Key:group only happy_hours: Pt:Key:happy hours height: Pt:Key:height @@ -16006,16 +18478,20 @@ pt: industrial: Pt:Key:industrial intermittent: Pt:Key:intermittent internet_access: Pt:Key:internet access + internet_access:ssid: Pt:Key:internet access:ssid is_in: Pt:Key:is in jetski:sales: Pt:Key:jetski:sales junction: Pt:Key:junction landuse: Pt:Key:landuse + lane_markings: Pt:Key:lane markings lanes: Pt:Key:lanes leisure: Pt:Key:leisure + length: Pt:Key:length listed_status: Pt:Key:listed status lit: Pt:Key:lit lock: Pt:Key:lock man_made: Pt:Key:man made + material: Pt:Key:material maxdraught: Pt:Key:maxdraught maxheight: Pt:Key:maxheight maxheight:legal: Pt:Key:maxheight:legal @@ -16026,6 +18502,7 @@ pt: maxweight: Pt:Key:maxweight military: Pt:Key:military min_height: Pt:Key:min height + minspeed: Pt:Key:minspeed monitoring:bicycle: Pt:Key:monitoring:bicycle monitoring:traffic: Pt:Key:monitoring:traffic mooring: Pt:Key:mooring @@ -16038,15 +18515,18 @@ pt: natural: Pt:Key:natural noexit: Pt:Key:noexit noname: Pt:Key:noname + note: Pt:Key:note office: Pt:Key:office oneway: Pt:Key:oneway opening_hours: Pt:Key:opening hours operator: Pt:Key:operator overtaking: Pt:Key:overtaking park_ride: Pt:Key:park ride + parking: Pt:Key:parking passing_places: Pt:Key:passing places place: Pt:Key:place placement: Pt:Key:placement + police: Pt:Key:police population: Pt:Key:population postal_code: Pt:Key:postal code power: Pt:Key:power @@ -16061,6 +18541,7 @@ pt: ref:vatin: Pt:Key:ref:vatin religion: Pt:Key:religion roof:material: Pt:Key:roof:material + rooms: Pt:Key:rooms route: Pt:Key:route sac_scale: Pt:Key:sac scale seamark: Pt:Key:seamark @@ -16075,11 +18556,14 @@ pt: smoothness: Pt:Key:smoothness social_facility: Pt:Key:social facility source: Pt:Key:source + source:date: Pt:Key:source:date + source:name: Pt:Key:source:name sport: Pt:Key:sport substance: Pt:Key:substance supervised: Pt:Key:supervised surface: Pt:Key:surface survey:date: Pt:Key:survey:date + tactile_paving: Pt:Key:tactile paving takeaway: Pt:Key:takeaway tiger: Pt:Key:tiger tourism: Pt:Key:tourism @@ -16144,6 +18628,7 @@ pt: amenity=bicycle_rental: Pt:Tag:amenity=bicycle rental amenity=bicycle_repair_station: Pt:Tag:amenity=bicycle repair station amenity=biergarten: Pt:Tag:amenity=biergarten + amenity=binoculars: Pt:Tag:amenity=binoculars amenity=blood_donation: Pt:Tag:amenity=blood donation amenity=boat_rental: Pt:Tag:amenity=boat rental amenity=boat_sharing: Pt:Tag:amenity=boat sharing @@ -16181,6 +18666,7 @@ pt: amenity=food_court: Pt:Tag:amenity=food court amenity=fountain: Pt:Tag:amenity=fountain amenity=fuel: Pt:Tag:amenity=fuel + amenity=funeral_hall: Pt:Tag:amenity=funeral hall amenity=gambling: Pt:Tag:amenity=gambling amenity=game_feeding: Pt:Tag:amenity=game feeding amenity=grave_yard: Pt:Tag:amenity=grave yard @@ -16198,6 +18684,7 @@ pt: amenity=library: Pt:Tag:amenity=library amenity=love_hotel: Pt:Tag:amenity=love hotel amenity=marketplace: Pt:Tag:amenity=marketplace + amenity=mortuary: Pt:Tag:amenity=mortuary amenity=motorcycle_parking: Pt:Tag:amenity=motorcycle parking amenity=music_school: Pt:Tag:amenity=music school amenity=nightclub: Pt:Tag:amenity=nightclub @@ -16274,16 +18761,20 @@ pt: boundary=protected_area: Pt:Tag:boundary=protected area bridge=boardwalk: Pt:Tag:bridge=boardwalk bridge=viaduct: Pt:Tag:bridge=viaduct + building=apartments: Pt:Tag:building=apartments + building=chapel: Pt:Tag:building=chapel building=church: Pt:Tag:building=church building=commercial: Pt:Tag:building=commercial building=house: Pt:Tag:building=house building=residential: Pt:Tag:building=residential building=roof: Pt:Tag:building=roof building=school: Pt:Tag:building=school + building=service: Pt:Tag:building=service building=shed: Pt:Tag:building=shed building=university: Pt:Tag:building=university building=yes: Pt:Tag:building=yes craft=agricultural_engines: Pt:Tag:craft=agricultural engines + craft=atelier: Pt:Tag:craft=atelier craft=basket_maker: Pt:Tag:craft=basket maker craft=beekeeper: Pt:Tag:craft=beekeeper craft=blacksmith: Pt:Tag:craft=blacksmith @@ -16334,10 +18825,13 @@ pt: craft=upholsterer: Pt:Tag:craft=upholsterer craft=watchmaker: Pt:Tag:craft=watchmaker craft=winery: Pt:Tag:craft=winery + crossing=traffic_signals: Pt:Tag:crossing=traffic signals emergency=ambulance_station: Pt:Tag:emergency=ambulance station + emergency=defibrillator: Pt:Tag:emergency=defibrillator emergency=fire_hydrant: Pt:Tag:emergency=fire hydrant emergency=phone: Pt:Tag:emergency=phone emergency=siren: Pt:Tag:emergency=siren + footway=crossing: Pt:Tag:footway=crossing geological=palaeontological_site: Pt:Tag:geological=palaeontological site government=cadaster: Pt:Tag:government=cadaster healthcare=blood_donation: Pt:Tag:healthcare=blood donation @@ -16347,11 +18841,13 @@ pt: highway=corridor: Pt:Tag:highway=corridor highway=crossing: Pt:Tag:highway=crossing highway=cycleway: Pt:Tag:highway=cycleway + highway=elevator: Pt:Tag:highway=elevator highway=emergency_access_point: Pt:Tag:highway=emergency access point highway=footway: Pt:Tag:highway=footway highway=ford: Pt:Tag:highway=ford highway=give_way: Pt:Tag:highway=give way highway=living_street: Pt:Tag:highway=living street + highway=milestone: Pt:Tag:highway=milestone highway=mini_roundabout: Pt:Tag:highway=mini roundabout highway=motorway: Pt:Tag:highway=motorway highway=motorway_junction: Pt:Tag:highway=motorway junction @@ -16373,7 +18869,9 @@ pt: highway=stop: Pt:Tag:highway=stop highway=street_lamp: Pt:Tag:highway=street lamp highway=tertiary: Pt:Tag:highway=tertiary + highway=toll_gantry: Pt:Tag:highway=toll gantry highway=track: Pt:Tag:highway=track + highway=traffic_mirror: Pt:Tag:highway=traffic mirror highway=traffic_signals: Pt:Tag:highway=traffic signals highway=trunk: Pt:Tag:highway=trunk highway=turning_circle: Pt:Tag:highway=turning circle @@ -16435,6 +18933,7 @@ pt: leisure=miniature_golf: Pt:Tag:leisure=miniature golf leisure=nature_reserve: Pt:Tag:leisure=nature reserve leisure=park: Pt:Tag:leisure=park + leisure=picnic_table: Pt:Tag:leisure=picnic table leisure=pitch: Pt:Tag:leisure=pitch leisure=playground: Pt:Tag:leisure=playground leisure=slipway: Pt:Tag:leisure=slipway @@ -16449,8 +18948,11 @@ pt: man_made=breakwater: Pt:Tag:man made=breakwater man_made=cairn: Pt:Tag:man made=cairn man_made=crane: Pt:Tag:man made=crane + man_made=cross: Pt:Tag:man made=cross man_made=cutline: Pt:Tag:man made=cutline + man_made=dovecote: Pt:Tag:man made=dovecote man_made=dyke: Pt:Tag:man made=dyke + man_made=embankment: Pt:Tag:man made=embankment man_made=flagpole: Pt:Tag:man made=flagpole man_made=groyne: Pt:Tag:man made=groyne man_made=jetty: Pt:Tag:man made=jetty @@ -16464,6 +18966,7 @@ pt: man_made=reservoir_covered: Pt:Tag:man made=reservoir covered man_made=surveillance: Pt:Tag:man made=surveillance man_made=survey_point: Pt:Tag:man made=survey point + man_made=threshing_floor: Pt:Tag:man made=threshing floor man_made=tower: Pt:Tag:man made=tower man_made=wastewater_plant: Pt:Tag:man made=wastewater plant man_made=water_tower: Pt:Tag:man made=water tower @@ -16472,6 +18975,7 @@ pt: man_made=watermill: Pt:Tag:man made=watermill man_made=windmill: Pt:Tag:man made=windmill man_made=works: Pt:Tag:man made=works + memorial=bust: Pt:Tag:memorial=bust military=airfield: Pt:Tag:military=airfield military=barracks: Pt:Tag:military=barracks military=bunker: Pt:Tag:military=bunker @@ -16494,10 +18998,12 @@ pt: natural=scree: Pt:Tag:natural=scree natural=scrub: Pt:Tag:natural=scrub natural=shoal: Pt:Tag:natural=shoal + natural=shrub: Pt:Tag:natural=shrub natural=spring: Pt:Tag:natural=spring natural=stone: Pt:Tag:natural=stone natural=tree: Pt:Tag:natural=tree natural=tree_row: Pt:Tag:natural=tree row + natural=valley: Pt:Tag:natural=valley natural=volcano: Pt:Tag:natural=volcano natural=water: Pt:Tag:natural=water natural=wetland: Pt:Tag:natural=wetland @@ -16549,6 +19055,7 @@ pt: place=suburb: Pt:Tag:place=suburb place=town: Pt:Tag:place=town place=village: Pt:Tag:place=village + police=car_pound: Pt:Tag:police=car pound power=cable_distribution_cabinet: Pt:Tag:power=cable distribution cabinet power=generator: Pt:Tag:power=generator power=line: Pt:Tag:power=line @@ -16723,6 +19230,7 @@ pt: tourism=zoo: Pt:Tag:tourism=zoo traffic_calming=island: Pt:Tag:traffic calming=island traffic_calming=table: Pt:Tag:traffic calming=table + traffic_sign=city_limit: Pt:Tag:traffic sign=city limit tunnel=culvert: Pt:Tag:tunnel=culvert vending=bicycle_tube: Pt:Tag:vending=bicycle tube waterway=boatyard: Pt:Tag:waterway=boatyard @@ -17447,15 +19955,23 @@ ro: leisure: Ro:Key:leisure tracktype: Ro:Key:tracktype tag: + amenity=karaoke_box: Ro:Tag:amenity=karaoke box amenity=nightclub: Ro:Tag:amenity=nightclub junction=roundabout: Ro:Tag:junction=roundabout ru: key: + 3dmr: RU:Key:3dmr abandoned: RU:Key:abandoned 'abandoned:': 'RU:Key:abandoned:' + abandoned:place: RU:Key:abandoned:place + abandoned:place=yes: RU:Key:abandoned:place=yes + abandoned:railway: RU:Key:abandoned:railway abutters: RU:Key:abutters access: RU:Key:access + access:bdouble: RU:Key:access:bdouble access:lhv: RU:Key:access:lhv + access:roadtrain: RU:Key:access:roadtrain + access:roadtrain:trailers: RU:Key:access:roadtrain:trailers addr: RU:Key:addr addr:city: RU:Key:addr:city addr:country: RU:Key:addr:country @@ -17484,6 +20000,7 @@ ru: attribution: RU:Key:attribution atv:sales: RU:Key:atv:sales backcountry: RU:Key:backcountry + backward: RU:Key:backward barrier: RU:Key:barrier bench: RU:Key:bench bicycle: RU:Key:bicycle @@ -17493,16 +20010,19 @@ ru: boat: RU:Key:boat books: RU:Key:books border_type: RU:Key:border type + both: RU:Key:both boundary: RU:Key:boundary brand: RU:Key:brand brand:wikidata: RU:Key:brand:wikidata bridge: RU:Key:bridge bridge:name: RU:Key:bridge:name + bridge:structure: RU:Key:bridge:structure bridge:support: RU:Key:bridge:support bridge_name: RU:Key:bridge name building: RU:Key:building building:architecture: RU:Key:building:architecture building:condition: RU:Key:building:condition + building:flats: RU:Key:building:flats building:height: RU:Key:building:height building:levels: RU:Key:building:levels building:levels:underground: RU:Key:building:levels:underground @@ -17510,21 +20030,31 @@ ru: building:min_level: RU:Key:building:min level building:part: RU:Key:building:part building:parts: RU:Key:building:parts + building:prefabricated: RU:Key:building:prefabricated + building:soft_storey: RU:Key:building:soft storey + building:structure: RU:Key:building:structure + building:units: RU:Key:building:units + building:usage:pl: RU:Key:building:usage:pl building:use: RU:Key:building:use + building:use:pl: RU:Key:building:use:pl bunker_type: RU:Key:bunker type bus: RU:Key:bus cafe: RU:Key:cafe + camp_site: RU:Key:camp site capacity: RU:Key:capacity + capital: RU:Key:capital caravan: RU:Key:caravan castle_type: RU:Key:castle type cemetery: RU:Key:cemetery check_date: RU:Key:check date checkpoint: RU:Key:checkpoint + clli: RU:Key:clli clothes: RU:Key:clothes club: RU:Key:club colour: RU:Key:colour comment: RU:Key:comment community_centre: RU:Key:community centre + condo: RU:Key:condo construction: RU:Key:construction contact: RU:Key:contact contact:facebook: RU:Key:contact:facebook @@ -17557,7 +20087,9 @@ ru: 'disused:': 'RU:Key:disused:' disused:shop: RU:Key:disused:shop dog: RU:Key:dog + door: RU:Key:door drinking_water: RU:Key:drinking water + drinking_water:legal: RU:Key:drinking water:legal drive_in: RU:Key:drive in drive_through: RU:Key:drive through driving_side: RU:Key:driving side @@ -17582,6 +20114,7 @@ ru: foot: RU:Key:foot footway: RU:Key:footway ford: RU:Key:ford + forward: RU:Key:forward fuel: RU:Key:fuel fuel:cng: RU:Key:fuel:cng fuel:lpg: RU:Key:fuel:lpg @@ -17605,6 +20138,7 @@ ru: ice_road: RU:Key:ice road image: RU:Key:image incline: RU:Key:incline + indoor: RU:Key:indoor industrial: RU:Key:industrial information: RU:Key:information inscription: RU:Key:inscription @@ -17612,6 +20146,7 @@ ru: intermittent: RU:Key:intermittent internet_access: RU:Key:internet access junction: RU:Key:junction + karaoke: RU:Key:karaoke kerb: RU:Key:kerb ladder: RU:Key:ladder lamp_mount: RU:Key:lamp mount @@ -17622,6 +20157,7 @@ ru: layer: RU:Key:layer leaf_cycle: RU:Key:leaf cycle leaf_type: RU:Key:leaf type + left: RU:Key:left leisure: RU:Key:leisure length: RU:Key:length level: RU:Key:level @@ -17644,6 +20180,7 @@ ru: maxspeed: RU:Key:maxspeed maxspeed:practical: RU:Key:maxspeed:practical maxstay: RU:Key:maxstay + maxtents: RU:Key:maxtents maxweight: RU:Key:maxweight maxwidth: RU:Key:maxwidth memorial:type: RU:Key:memorial:type @@ -17714,14 +20251,18 @@ ru: pump: RU:Key:pump railway: RU:Key:railway ramp: RU:Key:ramp + recycling:fire_extinguishers: RU:Key:recycling:fire extinguishers recycling_type: RU:Key:recycling type ref: RU:Key:ref + ref:ruian:building: RU:Key:ref:ruian:building reference: RU:Key:reference refitted: RU:Key:refitted reg_name: RU:Key:reg name reg_ref: RU:Key:reg ref religion: RU:Key:religion + resort: RU:Key:resort resource: RU:Key:resource + right: RU:Key:right roof:direction: RU:Key:roof:direction roof:material: RU:Key:roof:material room: RU:Key:room @@ -17754,6 +20295,7 @@ ru: source: RU:Key:source source:addr: RU:Key:source:addr source:maxspeed: RU:Key:source:maxspeed + source:taxon: RU:Key:source:taxon species: RU:Key:species sport: RU:Key:sport start_date: RU:Key:start date @@ -17764,6 +20306,7 @@ ru: survey:date: RU:Key:survey:date tactile_paving: RU:Key:tactile paving taxon: RU:Key:taxon + technology: RU:Key:technology todo: RU:Key:todo toilets: RU:Key:toilets toilets:wheelchair: RU:Key:toilets:wheelchair @@ -17773,6 +20316,7 @@ ru: tracktype: RU:Key:tracktype traffic_calming: RU:Key:traffic calming traffic_sign: RU:Key:traffic sign + traffic_signals: RU:Key:traffic signals trail_visibility: RU:Key:trail visibility tram: RU:Key:tram trolleybus: RU:Key:trolleybus @@ -17795,6 +20339,7 @@ ru: wikipedia:ru: RU:Key:wikipedia:ru winter_road: RU:Key:winter road wood: RU:Key:wood + xmas:feature: RU:Key:xmas:feature tag: access=customers: RU:Tag:access=customers access=delivery: RU:Tag:access=delivery @@ -17825,6 +20370,7 @@ ru: aeroway=terminal: RU:Tag:aeroway=terminal aeroway=windsock: RU:Tag:aeroway=windsock amenity=animal_boarding: RU:Tag:amenity=animal boarding + amenity=animal_breeding: RU:Tag:amenity=animal breeding amenity=animal_shelter: RU:Tag:amenity=animal shelter amenity=arts_centre: RU:Tag:amenity=arts centre amenity=atm: RU:Tag:amenity=atm @@ -17838,6 +20384,7 @@ ru: amenity=bicycle_repair_station: RU:Tag:amenity=bicycle repair station amenity=biergarten: RU:Tag:amenity=biergarten amenity=boat_storage: RU:Tag:amenity=boat storage + amenity=border_control: RU:Tag:amenity=border control amenity=brothel: RU:Tag:amenity=brothel amenity=bureau_de_change: RU:Tag:amenity=bureau de change amenity=bus_station: RU:Tag:amenity=bus station @@ -17847,6 +20394,7 @@ ru: amenity=car_wash: RU:Tag:amenity=car wash amenity=casino: RU:Tag:amenity=casino amenity=charging_station: RU:Tag:amenity=charging station + amenity=checkpoint: RU:Tag:amenity=checkpoint amenity=childcare: RU:Tag:amenity=childcare amenity=cinema: RU:Tag:amenity=cinema amenity=clinic: RU:Tag:amenity=clinic @@ -17859,11 +20407,13 @@ ru: amenity=courthouse: RU:Tag:amenity=courthouse amenity=coworking_space: RU:Tag:amenity=coworking space amenity=crematorium: RU:Tag:amenity=crematorium + amenity=customs: RU:Tag:amenity=customs amenity=dentist: RU:Tag:amenity=dentist amenity=device_charging_station: RU:Tag:amenity=device charging station amenity=doctors: RU:Tag:amenity=doctors amenity=dojo: RU:Tag:amenity=dojo amenity=drinking_water: RU:Tag:amenity=drinking water + amenity=driver_training: RU:Tag:amenity=driver training amenity=driving_school: RU:Tag:amenity=driving school amenity=embassy: RU:Tag:amenity=embassy amenity=fast_food: RU:Tag:amenity=fast food @@ -17993,6 +20543,7 @@ ru: barrier=log: RU:Tag:barrier=log barrier=retaining_wall: RU:Tag:barrier=retaining wall barrier=sally_port: RU:Tag:barrier=sally port + barrier=sliding_gate: RU:Tag:barrier=sliding gate barrier=swing_gate: RU:Tag:barrier=swing gate barrier=tank_trap: RU:Tag:barrier=tank trap barrier=toll_booth: RU:Tag:barrier=toll booth @@ -18018,26 +20569,52 @@ ru: bridge=aqueduct: RU:Tag:bridge=aqueduct bridge=cantilever: RU:Tag:bridge=cantilever bridge=covered: RU:Tag:bridge=covered + building=*: RU:Tag:building=* + building=Y: RU:Tag:building=Y + building=abandoned: RU:Tag:building=abandoned + building=allotment_house: RU:Tag:building=allotment house building=apartments: RU:Tag:building=apartments + building=bakehouse: RU:Tag:building=bakehouse building=barn: RU:Tag:building=barn building=boathouse: RU:Tag:building=boathouse + building=brewery: RU:Tag:building=brewery building=bridge: RU:Tag:building=bridge building=bungalow: RU:Tag:building=bungalow building=bunker: RU:Tag:building=bunker building=cabin: RU:Tag:building=cabin + building=carport: RU:Tag:building=carport building=cathedral: RU:Tag:building=cathedral + building=central_office: RU:Tag:building=central office building=chapel: RU:Tag:building=chapel building=church: RU:Tag:building=church + building=civic: RU:Tag:building=civic + building=collapsed: RU:Tag:building=collapsed + building=college: RU:Tag:building=college building=commercial: RU:Tag:building=commercial + building=condominium: RU:Tag:building=condominium + building=conservatory: RU:Tag:building=conservatory building=construction: RU:Tag:building=construction + building=container: RU:Tag:building=container + building=convent: RU:Tag:building=convent + building=cowshed: RU:Tag:building=cowshed building=detached: RU:Tag:building=detached + building=digester: RU:Tag:building=digester + building=disused: RU:Tag:building=disused building=dormitory: RU:Tag:building=dormitory building=entrance: RU:Tag:building=entrance + building=farm: RU:Tag:building=farm building=farm_auxiliary: RU:Tag:building=farm auxiliary + building=fire_station: RU:Tag:building=fire station building=font: RU:Tag:building=font + building=funeral_hall: RU:Tag:building=funeral hall building=garage: RU:Tag:building=garage building=garages: RU:Tag:building=garages + building=gatehouse: RU:Tag:building=gatehouse + building=ger: RU:Tag:building=ger + building=government: RU:Tag:building=government + building=grandstand: RU:Tag:building=grandstand building=greenhouse: RU:Tag:building=greenhouse + building=ground_station: RU:Tag:building=ground station building=hangar: RU:Tag:building=hangar building=hospital: RU:Tag:building=hospital building=hotel: RU:Tag:building=hotel @@ -18047,26 +20624,61 @@ ru: building=industrial: RU:Tag:building=industrial building=kindergarten: RU:Tag:building=kindergarten building=kiosk: RU:Tag:building=kiosk + building=manufacture: RU:Tag:building=manufacture + building=marquee: RU:Tag:building=marquee + building=monastery: RU:Tag:building=monastery building=mosque: RU:Tag:building=mosque + building=museum: RU:Tag:building=museum building=office: RU:Tag:building=office + building=parking: RU:Tag:building=parking + building=pavilion: RU:Tag:building=pavilion building=public: RU:Tag:building=public + building=religious: RU:Tag:building=religious building=residential: RU:Tag:building=residential building=retail: RU:Tag:building=retail + building=riding_hall: RU:Tag:building=riding hall building=roof: RU:Tag:building=roof building=ruins: RU:Tag:building=ruins building=school: RU:Tag:building=school + building=semi: RU:Tag:building=semi + building=semidetached_house: RU:Tag:building=semidetached house building=service: RU:Tag:building=service building=shed: RU:Tag:building=shed + building=ship: RU:Tag:building=ship + building=shrine: RU:Tag:building=shrine + building=slurry_tank: RU:Tag:building=slurry tank + building=sports_centre: RU:Tag:building=sports centre + building=sports_hall: RU:Tag:building=sports hall building=stable: RU:Tag:building=stable + building=stadium: RU:Tag:building=stadium + building=static_caravan: RU:Tag:building=static caravan + building=stilt_house: RU:Tag:building=stilt house + building=storage_tank: RU:Tag:building=storage tank building=sty: RU:Tag:building=sty + building=supermarket: RU:Tag:building=supermarket building=synagogue: RU:Tag:building=synagogue + building=tech_cab: RU:Tag:building=tech cab + building=temple: RU:Tag:building=temple + building=tent: RU:Tag:building=tent + building=terrace: RU:Tag:building=terrace + building=toilets: RU:Tag:building=toilets building=train_station: RU:Tag:building=train station + building=transformer_tower: RU:Tag:building=transformer tower building=transportation: RU:Tag:building=transportation + building=tree_house: RU:Tag:building=tree house + building=true: RU:Tag:building=true + building=trullo: RU:Tag:building=trullo + building=unclassified: RU:Tag:building=unclassified + building=undefined: RU:Tag:building=undefined + building=unidentified: RU:Tag:building=unidentified building=university: RU:Tag:building=university + building=unknown: RU:Tag:building=unknown building=warehouse: RU:Tag:building=warehouse building=water_tower: RU:Tag:building=water tower + building=yes: RU:Tag:building=yes bunker_type=pillbox: RU:Tag:bunker type=pillbox cafe=time-cafe: RU:Tag:cafe=time-cafe + cafe=time_cafe: RU:Tag:cafe=time cafe castle_type=defensive: RU:Tag:castle type=defensive castle_type=fortress: RU:Tag:castle type=fortress castle_type=kremlin: RU:Tag:castle type=kremlin @@ -18106,6 +20718,7 @@ ru: emergency=fire_hydrant: RU:Tag:emergency=fire hydrant emergency=fire_water_pond: RU:Tag:emergency=fire water pond emergency=phone: RU:Tag:emergency=phone + emergency=suction_point: RU:Tag:emergency=suction point emergency=water_tank: RU:Tag:emergency=water tank entrance=staircase: RU:Tag:entrance=staircase fast_food=cafeteria: RU:Tag:fast food=cafeteria @@ -18116,6 +20729,7 @@ ru: generator:source=hydro: RU:Tag:generator:source=hydro generator:type=boiler: RU:Tag:generator:type=boiler geological=palaeontological_site: RU:Tag:geological=palaeontological site + government=customs: RU:Tag:government=customs healthcare=blood_donation: RU:Tag:healthcare=blood donation healthcare=laboratory: RU:Tag:healthcare=laboratory highway=bridleway: RU:Tag:highway=bridleway @@ -18126,6 +20740,8 @@ ru: highway=cycleway: RU:Tag:highway=cycleway highway=elevator: RU:Tag:highway=elevator highway=emergency_access_point: RU:Tag:highway=emergency access point + highway=emergency_bay: RU:Tag:highway=emergency bay + highway=escape: RU:Tag:highway=escape highway=footway: RU:Tag:highway=footway highway=ford: RU:Tag:highway=ford highway=give_way: RU:Tag:highway=give way @@ -18193,6 +20809,7 @@ ru: historic=ship: RU:Tag:historic=ship historic=stone: RU:Tag:historic=stone historic=tank: RU:Tag:historic=tank + historic=tomb: RU:Tag:historic=tomb historic=tree_shrine: RU:Tag:historic=tree shrine historic=wayside_cross: RU:Tag:historic=wayside cross historic=wayside_shrine: RU:Tag:historic=wayside shrine @@ -18247,6 +20864,7 @@ ru: leaf_type=leafless: RU:Tag:leaf type=leafless leaf_type=mixed: RU:Tag:leaf type=mixed leaf_type=needleleaved: RU:Tag:leaf type=needleleaved + leisure=bandstand: RU:Tag:leisure=bandstand leisure=beach_resort: RU:Tag:leisure=beach resort leisure=common: RU:Tag:leisure=common leisure=dance: RU:Tag:leisure=dance @@ -18266,11 +20884,16 @@ ru: leisure=resort: RU:Tag:leisure=resort leisure=slipway: RU:Tag:leisure=slipway leisure=sports_centre: RU:Tag:leisure=sports centre + leisure=sports_hall: RU:Tag:leisure=sports hall leisure=stadium: RU:Tag:leisure=stadium leisure=summer_camp: RU:Tag:leisure=summer camp leisure=swimming_pool: RU:Tag:leisure=swimming pool leisure=track: RU:Tag:leisure=track leisure=water_park: RU:Tag:leisure=water park + location=overground: RU:Tag:location=overground + location=overhead: RU:Tag:location=overhead + location=underground: RU:Tag:location=underground + location=underwater: RU:Tag:location=underwater man_made=adit: RU:Tag:man made=adit man_made=beacon: RU:Tag:man made=beacon man_made=breakwater: RU:Tag:man made=breakwater @@ -18291,6 +20914,7 @@ ru: man_made=embankment: RU:Tag:man made=embankment man_made=flagpole: RU:Tag:man made=flagpole man_made=flare: RU:Tag:man made=flare + man_made=geoglyph: RU:Tag:man made=geoglyph man_made=lighthouse: RU:Tag:man made=lighthouse man_made=mast: RU:Tag:man made=mast man_made=mineshaft: RU:Tag:man made=mineshaft @@ -18301,6 +20925,7 @@ ru: man_made=pier: RU:Tag:man made=pier man_made=pillar: RU:Tag:man made=pillar man_made=pipeline: RU:Tag:man made=pipeline + man_made=pumping_station: RU:Tag:man made=pumping station man_made=reservoir_covered: RU:Tag:man made=reservoir covered man_made=silo: RU:Tag:man made=silo man_made=storage_tank: RU:Tag:man made=storage tank @@ -18318,8 +20943,10 @@ ru: man_made=wildlife_crossing: RU:Tag:man made=wildlife crossing man_made=windmill: RU:Tag:man made=windmill man_made=works: RU:Tag:man made=works + manhole=drain: RU:Tag:manhole=drain memorial=stele: RU:Tag:memorial=stele military=airfield: RU:Tag:military=airfield + military=barracks: RU:Tag:military=barracks military=bunker: RU:Tag:military=bunker military=checkpoint: RU:Tag:military=checkpoint military=naval_base: RU:Tag:military=naval base @@ -18401,6 +21028,7 @@ ru: playground=slide: RU:Tag:playground=slide playground=structure: RU:Tag:playground=structure police=barracks: RU:Tag:police=barracks + power=compensator: RU:Tag:power=compensator power=generator: RU:Tag:power=generator power=heliostat: RU:Tag:power=heliostat power=line: RU:Tag:power=line @@ -18418,6 +21046,7 @@ ru: pump=powered: RU:Tag:pump=powered railway=abandoned: RU:Tag:railway=abandoned railway=crossing: RU:Tag:railway=crossing + railway=disused: RU:Tag:railway=disused railway=level_crossing: RU:Tag:railway=level crossing railway=light_rail: RU:Tag:railway=light rail railway=miniature: RU:Tag:railway=miniature @@ -18433,6 +21062,7 @@ ru: railway=turntable: RU:Tag:railway=turntable religion=pagan: RU:Tag:religion=pagan religion=zoroastrian: RU:Tag:religion=zoroastrian + residential=apartments: RU:Tag:residential=apartments residential=rural: RU:Tag:residential=rural residential=urban: RU:Tag:residential=urban route=bus: RU:Tag:route=bus @@ -18541,10 +21171,12 @@ ru: shop=pet: RU:Tag:shop=pet shop=pet_grooming: RU:Tag:shop=pet grooming shop=power_tools: RU:Tag:shop=power tools + shop=pyrotechnics: RU:Tag:shop=pyrotechnics shop=radiotechnics: RU:Tag:shop=radiotechnics shop=religion: RU:Tag:shop=religion shop=seafood: RU:Tag:shop=seafood shop=second_hand: RU:Tag:shop=second hand + shop=security: RU:Tag:shop=security shop=ship_chandler: RU:Tag:shop=ship chandler shop=shoes: RU:Tag:shop=shoes shop=spices: RU:Tag:shop=spices @@ -18563,9 +21195,11 @@ ru: shop=vacuum_cleaner: RU:Tag:shop=vacuum cleaner shop=variety_store: RU:Tag:shop=variety store shop=video: RU:Tag:shop=video + shop=video_games: RU:Tag:shop=video games shop=watches: RU:Tag:shop=watches shop=wholesale: RU:Tag:shop=wholesale shop=window_blind: RU:Tag:shop=window blind + signpost=forestry_compartment: RU:Tag:signpost=forestry compartment sinkhole=bluehole: RU:Tag:sinkhole=bluehole site_type=fortification: RU:Tag:site type=fortification social_facility=group_home: RU:Tag:social facility=group home @@ -18578,6 +21212,7 @@ ru: sport=shooting: RU:Tag:sport=shooting summit:cross=yes: RU:Tag:summit:cross=yes tank_trap=czech_hedgehog: RU:Tag:tank trap=czech hedgehog + tomb=war_grave: RU:Tag:tomb=war grave tourism=apartment: RU:Tag:tourism=apartment tourism=aquarium: RU:Tag:tourism=aquarium tourism=artwork: RU:Tag:tourism=artwork @@ -18597,9 +21232,13 @@ ru: tourism=viewpoint: RU:Tag:tourism=viewpoint tower:type=bell_tower: RU:Tag:tower:type=bell tower tower:type=cooling: RU:Tag:tower:type=cooling + tower:type=lighting: RU:Tag:tower:type=lighting traffic_calming=table: RU:Tag:traffic calming=table tunnel=culvert: RU:Tag:tunnel=culvert type=site: RU:Tag:type=site + type=waterway: RU:Tag:type=waterway + vending=parcel_pickup: RU:Tag:vending=parcel pickup + water=river: RU:Tag:water=river waterway=boatyard: RU:Tag:waterway=boatyard waterway=brook: RU:Tag:waterway=brook waterway=canal: RU:Tag:waterway=canal @@ -18626,6 +21265,7 @@ sk: addr:conscriptionnumber: Sk:Key:addr:conscriptionnumber addr:streetnumber: Sk:Key:addr:streetnumber note: Sk:Key:note + ref:minvskaddress: Sk:Key:ref:minvskaddress sq: key: highway: Sq:Key:highway @@ -18647,6 +21287,9 @@ sv: leisure=fitness_station: Sv:Tag:leisure=fitness station railway=rail: Sv:Tag:railway=rail sport=motocross: Sv:Tag:sport=motocross +talk: + key: + real_fire: Talk:Key:real fire tr: key: amenity: Tr:Key:amenity @@ -18654,7 +21297,6 @@ tr: highway: Tr:Key:highway historic: Tr:Key:historic leisure: Tr:Key:leisure - religion: Tr:Key:religion shop: Tr:Key:shop sport: Tr:Key:sport tag: @@ -18663,6 +21305,8 @@ tr: amenity=school: Tr:Tag:amenity=school boundary=administrative: Tr:Tag:boundary=administrative building=mosque: Tr:Tag:building=mosque + highway=motorway: Tr:Tag:highway=motorway + highway=trunk: Tr:Tag:highway=trunk uk: key: abutters: Uk:Key:abutters @@ -18686,23 +21330,34 @@ uk: addr:state: Uk:Key:addr:state addr:street: Uk:Key:addr:street addr:unit: Uk:Key:addr:unit + admin_level: Uk:Key:admin level alt_name: Uk:Key:alt name amenity: Uk:Key:amenity arcade: Uk:Key:arcade area: Uk:Key:area area:highway: Uk:Key:area:highway + artwork_type: Uk:Key:artwork type + automated: Uk:Key:automated backward: Uk:Key:backward barrier: Uk:Key:barrier bench: Uk:Key:bench bicycle: Uk:Key:bicycle bicycle_parking: Uk:Key:bicycle parking + border_type: Uk:Key:border type boundary: Uk:Key:boundary bridge: Uk:Key:bridge building: Uk:Key:building + building:levels: Uk:Key:building:levels + capital: Uk:Key:capital colonnade: Uk:Key:colonnade + comment: Uk:Key:comment covered: Uk:Key:covered + craft: Uk:Key:craft + crane:type: Uk:Key:crane:type crossing: Uk:Key:crossing cutting: Uk:Key:cutting + date: Uk:Key:date + description: Uk:Key:description destination: Uk:Key:destination embankment: Uk:Key:embankment emergency: Uk:Key:emergency @@ -18712,12 +21367,14 @@ uk: footway: Uk:Key:footway ford: Uk:Key:ford forward: Uk:Key:forward + government: Uk:Key:government height: Uk:Key:height highway: Uk:Key:highway historic: Uk:Key:historic inscription: Uk:Key:inscription inscription:url: Uk:Key:inscription:url int_name: Uk:Key:int name + isced:level: Uk:Key:isced:level landuse: Uk:Key:landuse lanes: Uk:Key:lanes layer: Uk:Key:layer @@ -18742,6 +21399,8 @@ uk: name:uk: Uk:Key:name:uk nat_name: Uk:Key:nat name natural: Uk:Key:natural + noname: Uk:Key:noname + note: Uk:Key:note office: Uk:Key:office official_name: Uk:Key:official name official_name:ru: Uk:Key:official name:ru @@ -18749,8 +21408,14 @@ uk: oneway: Uk:Key:oneway oneway:bicycle: Uk:Key:oneway:bicycle oneway:moped: Uk:Key:oneway:moped + opening_hours: Uk:Key:opening hours + opening_hours/Tutorial: Uk:Key:opening hours/Tutorial + park_ride: Uk:Key:park ride place: Uk:Key:place playground: Uk:Key:playground + police: Uk:Key:police + population: Uk:Key:population + postal_code: Uk:Key:postal code power: Uk:Key:power pump: Uk:Key:pump railway: Uk:Key:railway @@ -18758,16 +21423,21 @@ uk: reference: Uk:Key:reference reg_name: Uk:Key:reg name religion: Uk:Key:religion + residential: Uk:Key:residential right: Uk:Key:right route: Uk:Key:route + ruins: Uk:Key:ruins service: Uk:Key:service + service:bicycle:pump: Uk:Key:service:bicycle:pump shelter_type: Uk:Key:shelter type + shop: Uk:Key:shop short_name: Uk:Key:short name short_name:ru: Uk:Key:short name:ru sidewalk: Uk:Key:sidewalk sorting_name: Uk:Key:sorting name source: Uk:Key:source source:addr: Uk:Key:source:addr + species:wikidata: Uk:Key:species:wikidata sport: Uk:Key:sport surface: Uk:Key:surface tracktype: Uk:Key:tracktype @@ -18780,9 +21450,13 @@ uk: water_source: Uk:Key:water source waterway: Uk:Key:waterway width: Uk:Key:width + wikidata: Uk:Key:wikidata wikipedia: Uk:Key:wikipedia wood: Uk:Key:wood tag: + admin_level=2: Uk:Tag:admin level=2 + admin_level=4: Uk:Tag:admin level=4 + admin_level=6: Uk:Tag:admin level=6 amenity=atm: Uk:Tag:amenity=atm amenity=bench: Uk:Tag:amenity=bench amenity=bicycle_parking: Uk:Tag:amenity=bicycle parking @@ -18792,6 +21466,7 @@ uk: amenity=fuel: Uk:Tag:amenity=fuel amenity=grave_yard: Uk:Tag:amenity=grave yard amenity=hospital: Uk:Tag:amenity=hospital + amenity=kindergarten: Uk:Tag:amenity=kindergarten amenity=kiosk: Uk:Tag:amenity=kiosk amenity=park: Uk:Tag:amenity=park amenity=parking: Uk:Tag:amenity=parking @@ -18803,6 +21478,10 @@ uk: amenity=shelter: Uk:Tag:amenity=shelter amenity=university: Uk:Tag:amenity=university barrier=retaining_wall: Uk:Tag:barrier=retaining wall + boundary=administrative: Uk:Tag:boundary=administrative + boundary=historic: Uk:Tag:boundary=historic + boundary=postal_code: Uk:Tag:boundary=postal code + building=church: Uk:Tag:building=church building=commercial: Uk:Tag:building=commercial building=hospital: Uk:Tag:building=hospital craft=agricultural_engines: Uk:Tag:craft=agricultural engines @@ -18814,7 +21493,12 @@ uk: entrance=staircase: Uk:Tag:entrance=staircase footway=crossing: Uk:Tag:footway=crossing footway=sidewalk: Uk:Tag:footway=sidewalk + government=legislative: Uk:Tag:government=legislative + government=ministry: Uk:Tag:government=ministry + government=prosecutor: Uk:Tag:government=prosecutor + government=tax: Uk:Tag:government=tax highway=bridleway: Uk:Tag:highway=bridleway + highway=construction: Uk:Tag:highway=construction highway=cycleway: Uk:Tag:highway=cycleway highway=footway: Uk:Tag:highway=footway highway=ford: Uk:Tag:highway=ford @@ -18835,14 +21519,20 @@ uk: highway=traffic_mirror: Uk:Tag:highway=traffic mirror highway=trunk: Uk:Tag:highway=trunk highway=unclassified: Uk:Tag:highway=unclassified + historic=aircraft: Uk:Tag:historic=aircraft + historic=cannon: Uk:Tag:historic=cannon historic=memorial: Uk:Tag:historic=memorial historic=monument: Uk:Tag:historic=monument + historic=ship: Uk:Tag:historic=ship + historic=tank: Uk:Tag:historic=tank + historic=vehicle: Uk:Tag:historic=vehicle historic=wayside_cross: Uk:Tag:historic=wayside cross industrial=bakery: Uk:Tag:industrial=bakery landuse=cemetery: Uk:Tag:landuse=cemetery landuse=flowerbed: Uk:Tag:landuse=flowerbed landuse=forest: Uk:Tag:landuse=forest landuse=hop_garden: Uk:Tag:landuse=hop garden + landuse=meadow: Uk:Tag:landuse=meadow landuse=residential: Uk:Tag:landuse=residential landuse=village_green: Uk:Tag:landuse=village green leaf_cycle=evergreen: Uk:Tag:leaf cycle=evergreen @@ -18852,10 +21542,17 @@ uk: man_made=pier: Uk:Tag:man made=pier man_made=water_well: Uk:Tag:man made=water well natural=bare_rock: Uk:Tag:natural=bare rock + natural=birds_nest: Uk:Tag:natural=birds nest + natural=cliff: Uk:Tag:natural=cliff + natural=earth_bank: Uk:Tag:natural=earth bank natural=grassland: Uk:Tag:natural=grassland + natural=gully: Uk:Tag:natural=gully + natural=heath: Uk:Tag:natural=heath + natural=scree: Uk:Tag:natural=scree natural=scrub: Uk:Tag:natural=scrub natural=tree: Uk:Tag:natural=tree natural=tree_row: Uk:Tag:natural=tree row + natural=valley: Uk:Tag:natural=valley natural=water: Uk:Tag:natural=water natural=wood: Uk:Tag:natural=wood office=accountant: Uk:Tag:office=accountant @@ -18873,12 +21570,43 @@ uk: office=research: Uk:Tag:office=research office=telecommunication: Uk:Tag:office=telecommunication office=travel_agent: Uk:Tag:office=travel agent + place=archipelago: Uk:Tag:place=archipelago + place=borough: Uk:Tag:place=borough + place=city: Uk:Tag:place=city + place=city_block: Uk:Tag:place=city block + place=continent: Uk:Tag:place=continent + place=country: Uk:Tag:place=country + place=county: Uk:Tag:place=county + place=district: Uk:Tag:place=district + place=farm: Uk:Tag:place=farm + place=hamlet: Uk:Tag:place=hamlet + place=island: Uk:Tag:place=island + place=islet: Uk:Tag:place=islet + place=isolated_dwelling: Uk:Tag:place=isolated dwelling + place=locality: Uk:Tag:place=locality + place=municipality: Uk:Tag:place=municipality + place=neighbourhood: Uk:Tag:place=neighbourhood + place=ocean: Uk:Tag:place=ocean + place=plot: Uk:Tag:place=plot + place=province: Uk:Tag:place=province + place=quarter: Uk:Tag:place=quarter + place=region: Uk:Tag:place=region + place=sea: Uk:Tag:place=sea + place=square: Uk:Tag:place=square + place=state: Uk:Tag:place=state + place=suburb: Uk:Tag:place=suburb + place=town: Uk:Tag:place=town + place=village: Uk:Tag:place=village + police=offices: Uk:Tag:police=offices pump=powered: Uk:Tag:pump=powered + railway=abandoned: Uk:Tag:railway=abandoned railway=halt: Uk:Tag:railway=halt railway=rail: Uk:Tag:railway=rail railway=station: Uk:Tag:railway=station railway=tram: Uk:Tag:railway=tram religion=christian: Uk:Tag:religion=christian + residential=rural: Uk:Tag:residential=rural + residential=urban: Uk:Tag:residential=urban route=train: Uk:Tag:route=train shop=antiques: Uk:Tag:shop=antiques shop=baby_goods: Uk:Tag:shop=baby goods @@ -18886,8 +21614,11 @@ uk: shop=optician: Uk:Tag:shop=optician shop=second_hand: Uk:Tag:shop=second hand sport=Swimming: Uk:Tag:sport=Swimming + sport=paragliding: Uk:Tag:sport=paragliding sport=shooting: Uk:Tag:sport=shooting + sport=skiing: Uk:Tag:sport=skiing sport=swimming: Uk:Tag:sport=swimming + type=boundary: Uk:Tag:type=boundary vending=bicycle_tube: Uk:Tag:vending=bicycle tube waterway=riverbank: Uk:Tag:waterway=riverbank vi: @@ -18947,35 +21678,80 @@ yue: tourism=attraction: Yue:Tag:tourism=attraction zh-hans: key: + access: Zh-hans:Key:access amenity: Zh-hans:Key:amenity + building: Zh-hans:Key:building building:part: Zh-hans:Key:building:part cuisine: Zh-hans:Key:cuisine ele: Zh-hans:Key:ele + entrance: Zh-hans:Key:entrance + foot: Zh-hans:Key:foot height: Zh-hans:Key:height highway: Zh-hans:Key:highway landuse: Zh-hans:Key:landuse + leisure: Zh-hans:Key:leisure + motorcycle: Zh-hans:Key:motorcycle name: Zh-hans:Key:name + oneway: Zh-hans:Key:oneway + overtaking: Zh-hans:Key:overtaking parking:lane: Zh-hans:Key:parking:lane place: Zh-hans:Key:place + plant:method: Zh-hans:Key:plant:method railway: Zh-hans:Key:railway + railway:etcs: Zh-hans:Key:railway:etcs + railway:lzb: Zh-hans:Key:railway:lzb + ref: Zh-hans:Key:ref + residential: Zh-hans:Key:residential + roof:direction: Zh-hans:Key:roof:direction + roof:shape: Zh-hans:Key:roof:shape + surface: Zh-hans:Key:surface toll: Zh-hans:Key:toll + turn: Zh-hans:Key:turn + waterway: Zh-hans:Key:waterway wheelchair: Zh-hans:Key:wheelchair tag: amenity=bar: Zh-hans:Tag:amenity=bar amenity=cafe: Zh-hans:Tag:amenity=cafe + amenity=toilets: Zh-hans:Tag:amenity=toilets barrier=toll_booth: Zh-hans:Tag:barrier=toll booth barrier=wall: Zh-hans:Tag:barrier=wall + bridge:structure=humpback: Zh-hans:Tag:bridge:structure=humpback + building=detached: Zh-hans:Tag:building=detached + generator:source=wind: Zh-hans:Tag:generator:source=wind + highway=bus_stop: Zh-hans:Tag:highway=bus stop highway=footway: Zh-hans:Tag:highway=footway highway=residential: Zh-hans:Tag:highway=residential highway=tertiary: Zh-hans:Tag:highway=tertiary + highway=toll_gantry: Zh-hans:Tag:highway=toll gantry + highway=traffic_signals: Zh-hans:Tag:highway=traffic signals + historic=stone: Zh-hans:Tag:historic=stone + landuse=commercial: Zh-hans:Tag:landuse=commercial + landuse=forest: Zh-hans:Tag:landuse=forest + man_made=antenna: Zh-hans:Tag:man made=antenna + man_made=dyke: Zh-hans:Tag:man made=dyke + natural=sand: Zh-hans:Tag:natural=sand + natural=wood: Zh-hans:Tag:natural=wood + network=CN:AH: Zh-hans:Tag:network=CN:AH + network=CN:JS: Zh-hans:Tag:network=CN:JS + network=CN:national: Zh-hans:Tag:network=CN:national + office=government: Zh-hans:Tag:office=government place=hamlet: Zh-hans:Tag:place=hamlet + power=line: Zh-hans:Tag:power=line + power=tower: Zh-hans:Tag:power=tower railway=light_rail: Zh-hans:Tag:railway=light rail railway=subway: Zh-hans:Tag:railway=subway railway=subway_entrance: Zh-hans:Tag:railway=subway entrance + railway=traverser: Zh-hans:Tag:railway=traverser route=light_rail: Zh-hans:Tag:route=light rail route=subway: Zh-hans:Tag:route=subway + service=parking_aisle: Zh-hans:Tag:service=parking aisle station=light_rail: Zh-hans:Tag:station=light rail station=subway: Zh-hans:Tag:station=subway + surface=acrylic: Zh-hans:Tag:surface=acrylic + surface=artificial_turf: Zh-hans:Tag:surface=artificial turf + surface=tartan: Zh-hans:Tag:surface=tartan + vending=ice_cream: Zh-hans:Tag:vending=ice cream + waterway=weir: Zh-hans:Tag:waterway=weir zh-hant: key: access: Zh-hant:Key:access @@ -18997,11 +21773,15 @@ zh-hant: name: Zh-hant:Key:name noexit: Zh-hant:Key:noexit office: Zh-hant:Key:office + oneway: Zh-hant:Key:oneway opening_hours: Zh-hant:Key:opening hours playground: Zh-hant:Key:playground + religion: Zh-hant:Key:religion service: Zh-hant:Key:service + shelter_type: Zh-hant:Key:shelter type shop: Zh-hant:Key:shop takeaway: Zh-hant:Key:takeaway + toll: Zh-hant:Key:toll tracktype: Zh-hant:Key:tracktype traffic_calming: Zh-hant:Key:traffic calming trail_visibility: Zh-hant:Key:trail visibility @@ -19014,11 +21794,13 @@ zh-hant: amenity=drinking_water: Zh-hant:Tag:amenity=drinking water amenity=fountain: Zh-hant:Tag:amenity=fountain amenity=fuel: Zh-hant:Tag:amenity=fuel + amenity=parking: Zh-hant:Tag:amenity=parking amenity=place_of_worship: Zh-hant:Tag:amenity=place of worship amenity=post_box: Zh-hant:Tag:amenity=post box amenity=research_institute: Zh-hant:Tag:amenity=research institute amenity=ticket_validator: Zh-hant:Tag:amenity=ticket validator amenity=toilets: Zh-hant:Tag:amenity=toilets + barrier=toll_booth: Zh-hant:Tag:barrier=toll booth building=roof: Zh-hant:Tag:building=roof highway=bus_guideway: Zh-hant:Tag:highway=bus guideway highway=bus_stop: Zh-hant:Tag:highway=bus stop @@ -19043,9 +21825,12 @@ zh-hant: landuse=cemetery: Zh-hant:Tag:landuse=cemetery leisure=adult_gaming_centre: Zh-hant:Tag:leisure=adult gaming centre leisure=firepit: Zh-hant:Tag:leisure=firepit + leisure=fitness_centre: Zh-hant:Tag:leisure=fitness centre leisure=pitch: Zh-hant:Tag:leisure=pitch man_made=embankment: Zh-hant:Tag:man made=embankment natural=peak: Zh-hant:Tag:natural=peak + natural=scree: Zh-hant:Tag:natural=scree + power=plant: Zh-hant:Tag:power=plant railway=rail: Zh-hant:Tag:railway=rail service=alley: Zh-hant:Tag:service=alley service=drive-through: Zh-hant:Tag:service=drive-through @@ -19053,4 +21838,6 @@ zh-hant: shop=games: Zh-hant:Tag:shop=games shop=gas: Zh-hant:Tag:shop=gas tourism=alpine_hut: Zh-hant:Tag:tourism=alpine hut + waterway=river: Zh-hant:Tag:waterway=river + waterway=riverbank: Zh-hant:Tag:waterway=riverbank diff --git a/db/migrate/001_create_osm_db.rb b/db/migrate/001_create_osm_db.rb index 3772c5dc2..43e4bf4b2 100644 --- a/db/migrate/001_create_osm_db.rb +++ b/db/migrate/001_create_osm_db.rb @@ -1,5 +1,3 @@ -require "migrate" - class CreateOsmDb < ActiveRecord::Migration[4.2] def self.up create_table "current_nodes", :id => false do |t| diff --git a/db/migrate/002_cleanup_osm_db.rb b/db/migrate/002_cleanup_osm_db.rb index 8728f1a6a..23f988dc1 100644 --- a/db/migrate/002_cleanup_osm_db.rb +++ b/db/migrate/002_cleanup_osm_db.rb @@ -1,5 +1,3 @@ -require "migrate" - class CleanupOsmDb < ActiveRecord::Migration[4.2] def self.up change_column "current_nodes", "latitude", :float, :limit => 53, :null => false diff --git a/db/migrate/003_sql_session_store_setup.rb b/db/migrate/003_sql_session_store_setup.rb index 060ffe089..1be5daf7a 100644 --- a/db/migrate/003_sql_session_store_setup.rb +++ b/db/migrate/003_sql_session_store_setup.rb @@ -1,5 +1,3 @@ -require "migrate" - class SqlSessionStoreSetup < ActiveRecord::Migration[4.2] def self.up create_table "sessions" do |t| diff --git a/db/migrate/004_user_enhancements.rb b/db/migrate/004_user_enhancements.rb index 99da718fd..5d3bc4858 100644 --- a/db/migrate/004_user_enhancements.rb +++ b/db/migrate/004_user_enhancements.rb @@ -1,5 +1,3 @@ -require "migrate" - class UserEnhancements < ActiveRecord::Migration[4.2] def self.up add_column "diary_entries", "latitude", :float, :limit => 53 diff --git a/db/migrate/005_tile_tracepoints.rb b/db/migrate/005_tile_tracepoints.rb index b46fdf25f..0e557067d 100644 --- a/db/migrate/005_tile_tracepoints.rb +++ b/db/migrate/005_tile_tracepoints.rb @@ -1,5 +1,3 @@ -require "migrate" - class TileTracepoints < ActiveRecord::Migration[4.2] class Tracepoint < ApplicationRecord self.table_name = "gps_points" diff --git a/db/migrate/006_tile_nodes.rb b/db/migrate/006_tile_nodes.rb index d13ada170..7fdb34e57 100644 --- a/db/migrate/006_tile_nodes.rb +++ b/db/migrate/006_tile_nodes.rb @@ -1,5 +1,3 @@ -require "migrate" - class TileNodes < ActiveRecord::Migration[4.2] class Node < ApplicationRecord self.table_name = "current_nodes" diff --git a/db/migrate/007_add_relations.rb b/db/migrate/007_add_relations.rb index 05d3c634b..1e5bc5d3a 100644 --- a/db/migrate/007_add_relations.rb +++ b/db/migrate/007_add_relations.rb @@ -1,5 +1,3 @@ -require "migrate" - class AddRelations < ActiveRecord::Migration[4.2] def self.up # enums work like strings but are more efficient diff --git a/db/migrate/008_remove_segments.rb b/db/migrate/008_remove_segments.rb index f8a3085c6..c528742c9 100644 --- a/db/migrate/008_remove_segments.rb +++ b/db/migrate/008_remove_segments.rb @@ -1,5 +1,3 @@ -require "migrate" - class RemoveSegments < ActiveRecord::Migration[4.2] def self.up have_segs = select_value("SELECT count(*) FROM current_segments").to_i.nonzero? diff --git a/db/migrate/010_diary_comments.rb b/db/migrate/010_diary_comments.rb index 94d8a985b..15730bd8e 100644 --- a/db/migrate/010_diary_comments.rb +++ b/db/migrate/010_diary_comments.rb @@ -1,5 +1,3 @@ -require "migrate" - class DiaryComments < ActiveRecord::Migration[4.2] def self.up create_table "diary_comments", :id => false do |t| diff --git a/db/migrate/018_create_acls.rb b/db/migrate/018_create_acls.rb index c5c7c7444..ce5b6d4ca 100644 --- a/db/migrate/018_create_acls.rb +++ b/db/migrate/018_create_acls.rb @@ -1,5 +1,3 @@ -require "migrate" - class CreateAcls < ActiveRecord::Migration[4.2] def self.up create_table "acls", :id => false do |t| diff --git a/db/migrate/020_populate_node_tags_and_remove.rb b/db/migrate/020_populate_node_tags_and_remove.rb index fbb5d1af4..c8c017806 100644 --- a/db/migrate/020_populate_node_tags_and_remove.rb +++ b/db/migrate/020_populate_node_tags_and_remove.rb @@ -1,5 +1,3 @@ -require "migrate" - class PopulateNodeTagsAndRemove < ActiveRecord::Migration[4.2] def self.up have_nodes = select_value("SELECT count(*) FROM current_nodes").to_i.nonzero? diff --git a/db/migrate/021_move_to_innodb.rb b/db/migrate/021_move_to_innodb.rb index 81663eb1b..4dac8410c 100644 --- a/db/migrate/021_move_to_innodb.rb +++ b/db/migrate/021_move_to_innodb.rb @@ -1,5 +1,3 @@ -require "migrate" - class MoveToInnodb < ActiveRecord::Migration[4.2] @conv_tables = %w[nodes ways way_tags way_nodes current_way_tags relation_members relations relation_tags current_relation_tags] diff --git a/db/migrate/022_key_constraints.rb b/db/migrate/022_key_constraints.rb index 3030ed2cf..e7840b414 100644 --- a/db/migrate/022_key_constraints.rb +++ b/db/migrate/022_key_constraints.rb @@ -1,5 +1,3 @@ -require "migrate" - class KeyConstraints < ActiveRecord::Migration[4.2] def self.up # Primary keys diff --git a/db/migrate/023_add_changesets.rb b/db/migrate/023_add_changesets.rb index d835b22cb..ff6ce2bb4 100644 --- a/db/migrate/023_add_changesets.rb +++ b/db/migrate/023_add_changesets.rb @@ -1,5 +1,3 @@ -require "migrate" - class AddChangesets < ActiveRecord::Migration[4.2] @conv_user_tables = %w[current_nodes current_relations current_ways nodes relations ways] diff --git a/db/migrate/024_order_relation_members.rb b/db/migrate/024_order_relation_members.rb index c2a3ada32..77ef3a559 100644 --- a/db/migrate/024_order_relation_members.rb +++ b/db/migrate/024_order_relation_members.rb @@ -1,5 +1,3 @@ -require "migrate" - class OrderRelationMembers < ActiveRecord::Migration[4.2] def self.up # add sequence column. rails won't let us define an ordering here, diff --git a/db/migrate/025_add_end_time_to_changesets.rb b/db/migrate/025_add_end_time_to_changesets.rb index 985e57285..c25701088 100644 --- a/db/migrate/025_add_end_time_to_changesets.rb +++ b/db/migrate/025_add_end_time_to_changesets.rb @@ -1,5 +1,3 @@ -require "migrate" - class AddEndTimeToChangesets < ActiveRecord::Migration[4.2] def self.up # swap the boolean closed-or-not for a time when the changeset will diff --git a/db/migrate/028_add_more_changeset_indexes.rb b/db/migrate/028_add_more_changeset_indexes.rb index 3a5e941ed..d7a6df7ab 100644 --- a/db/migrate/028_add_more_changeset_indexes.rb +++ b/db/migrate/028_add_more_changeset_indexes.rb @@ -1,5 +1,3 @@ -require "migrate" - class AddMoreChangesetIndexes < ActiveRecord::Migration[4.2] def self.up add_index "changesets", ["created_at"], :name => "changesets_created_at_idx" diff --git a/db/migrate/029_add_user_foreign_keys.rb b/db/migrate/029_add_user_foreign_keys.rb index d91b9a17e..33ba25721 100644 --- a/db/migrate/029_add_user_foreign_keys.rb +++ b/db/migrate/029_add_user_foreign_keys.rb @@ -1,5 +1,3 @@ -require "migrate" - class AddUserForeignKeys < ActiveRecord::Migration[4.2] def change add_foreign_key :changesets, :users, :name => "changesets_user_id_fkey" diff --git a/db/migrate/030_add_foreign_keys.rb b/db/migrate/030_add_foreign_keys.rb index ed7652543..ded44d772 100644 --- a/db/migrate/030_add_foreign_keys.rb +++ b/db/migrate/030_add_foreign_keys.rb @@ -1,5 +1,3 @@ -require "migrate" - class AddForeignKeys < ActiveRecord::Migration[4.2] def self.up add_foreign_key :changeset_tags, :changesets, :column => :id, :name => "changeset_tags_id_fkey" diff --git a/db/migrate/031_create_countries.rb b/db/migrate/031_create_countries.rb index bdb247036..c26bdd08c 100644 --- a/db/migrate/031_create_countries.rb +++ b/db/migrate/031_create_countries.rb @@ -1,4 +1,3 @@ -require "migrate" require "rexml/document" class CreateCountries < ActiveRecord::Migration[4.2] diff --git a/db/migrate/034_create_languages.rb b/db/migrate/034_create_languages.rb index 20b80ec5b..245903551 100644 --- a/db/migrate/034_create_languages.rb +++ b/db/migrate/034_create_languages.rb @@ -1,5 +1,3 @@ -require "migrate" - class CreateLanguages < ActiveRecord::Migration[4.2] def change create_table :languages, :id => false do |t| diff --git a/db/migrate/035_change_user_locale.rb b/db/migrate/035_change_user_locale.rb index 3de3492c8..d1315fa06 100644 --- a/db/migrate/035_change_user_locale.rb +++ b/db/migrate/035_change_user_locale.rb @@ -1,5 +1,3 @@ -require "migrate" - class ChangeUserLocale < ActiveRecord::Migration[4.2] def self.up remove_foreign_key :users, :column => :locale, :name => "users_locale_fkey" diff --git a/db/migrate/039_add_more_controls_to_gpx_files.rb b/db/migrate/039_add_more_controls_to_gpx_files.rb index 2c3fee5be..728b56989 100644 --- a/db/migrate/039_add_more_controls_to_gpx_files.rb +++ b/db/migrate/039_add_more_controls_to_gpx_files.rb @@ -1,5 +1,3 @@ -require "migrate" - class AddMoreControlsToGpxFiles < ActiveRecord::Migration[4.2] class Trace < ApplicationRecord self.table_name = "gpx_files" diff --git a/db/migrate/042_add_foreign_keys_to_oauth_tables.rb b/db/migrate/042_add_foreign_keys_to_oauth_tables.rb index b302458c7..a57fe9885 100644 --- a/db/migrate/042_add_foreign_keys_to_oauth_tables.rb +++ b/db/migrate/042_add_foreign_keys_to_oauth_tables.rb @@ -1,5 +1,3 @@ -require "migrate" - class AddForeignKeysToOauthTables < ActiveRecord::Migration[4.2] def change add_foreign_key :oauth_tokens, :users, :name => "oauth_tokens_user_id_fkey" diff --git a/db/migrate/044_create_user_roles.rb b/db/migrate/044_create_user_roles.rb index 0039859bf..ece98a54d 100644 --- a/db/migrate/044_create_user_roles.rb +++ b/db/migrate/044_create_user_roles.rb @@ -1,5 +1,3 @@ -require "migrate" - class CreateUserRoles < ActiveRecord::Migration[4.2] class User < ApplicationRecord end diff --git a/db/migrate/045_create_user_blocks.rb b/db/migrate/045_create_user_blocks.rb index 182e2f498..4328e0b97 100644 --- a/db/migrate/045_create_user_blocks.rb +++ b/db/migrate/045_create_user_blocks.rb @@ -1,5 +1,3 @@ -require "migrate" - class CreateUserBlocks < ActiveRecord::Migration[4.2] def change create_table :user_blocks do |t| diff --git a/db/migrate/046_alter_user_roles_and_blocks.rb b/db/migrate/046_alter_user_roles_and_blocks.rb index b10fcf144..c1d3cd987 100644 --- a/db/migrate/046_alter_user_roles_and_blocks.rb +++ b/db/migrate/046_alter_user_roles_and_blocks.rb @@ -1,5 +1,3 @@ -require "migrate" - class AlterUserRolesAndBlocks < ActiveRecord::Migration[4.2] class UserRole < ApplicationRecord end diff --git a/db/migrate/051_add_status_to_user.rb b/db/migrate/051_add_status_to_user.rb index 23761f248..f170e0de8 100644 --- a/db/migrate/051_add_status_to_user.rb +++ b/db/migrate/051_add_status_to_user.rb @@ -1,5 +1,3 @@ -require "migrate" - class AddStatusToUser < ActiveRecord::Migration[4.2] class User < ApplicationRecord end diff --git a/db/migrate/053_add_map_bug_tables.rb b/db/migrate/053_add_map_bug_tables.rb index e8e01ec07..6ad3af0eb 100644 --- a/db/migrate/053_add_map_bug_tables.rb +++ b/db/migrate/053_add_map_bug_tables.rb @@ -1,5 +1,3 @@ -require "migrate" - class AddMapBugTables < ActiveRecord::Migration[4.2] def self.up create_enumeration :map_bug_status_enum, %w[open closed hidden] diff --git a/db/migrate/054_refactor_map_bug_tables.rb b/db/migrate/054_refactor_map_bug_tables.rb index 4bd713bd7..23221c7b1 100644 --- a/db/migrate/054_refactor_map_bug_tables.rb +++ b/db/migrate/054_refactor_map_bug_tables.rb @@ -1,5 +1,3 @@ -require "migrate" - class RefactorMapBugTables < ActiveRecord::Migration[4.2] def self.up create_table :map_bug_comment do |t| diff --git a/db/migrate/055_change_map_bug_comment_type.rb b/db/migrate/055_change_map_bug_comment_type.rb index c206325fa..1fab93b44 100644 --- a/db/migrate/055_change_map_bug_comment_type.rb +++ b/db/migrate/055_change_map_bug_comment_type.rb @@ -1,5 +1,3 @@ -require "migrate" - class ChangeMapBugCommentType < ActiveRecord::Migration[4.2] def self.up change_column :map_bug_comment, :comment, :text diff --git a/db/migrate/056_add_date_closed.rb b/db/migrate/056_add_date_closed.rb index 57efa7c8a..b6da41466 100644 --- a/db/migrate/056_add_date_closed.rb +++ b/db/migrate/056_add_date_closed.rb @@ -1,5 +1,3 @@ -require "migrate" - class AddDateClosed < ActiveRecord::Migration[4.2] def self.up add_column :map_bugs, :date_closed, :timestamp diff --git a/db/migrate/057_add_map_bug_comment_event.rb b/db/migrate/057_add_map_bug_comment_event.rb index ecdb967a1..c88544099 100644 --- a/db/migrate/057_add_map_bug_comment_event.rb +++ b/db/migrate/057_add_map_bug_comment_event.rb @@ -1,5 +1,3 @@ -require "migrate" - class AddMapBugCommentEvent < ActiveRecord::Migration[4.2] def self.up create_enumeration :map_bug_event_enum, %w[opened closed reopened commented hidden] diff --git a/db/migrate/20110521142405_rename_bugs_to_notes.rb b/db/migrate/20110521142405_rename_bugs_to_notes.rb index 54b443b32..d3260dfa1 100644 --- a/db/migrate/20110521142405_rename_bugs_to_notes.rb +++ b/db/migrate/20110521142405_rename_bugs_to_notes.rb @@ -1,5 +1,3 @@ -require "migrate" - class RenameBugsToNotes < ActiveRecord::Migration[4.2] def self.up rename_enumeration "map_bug_status_enum", "note_status_enum" diff --git a/db/migrate/20111212183945_add_lowercase_user_indexes.rb b/db/migrate/20111212183945_add_lowercase_user_indexes.rb index 202b23388..df6a48c16 100644 --- a/db/migrate/20111212183945_add_lowercase_user_indexes.rb +++ b/db/migrate/20111212183945_add_lowercase_user_indexes.rb @@ -1,5 +1,3 @@ -require "migrate" - class AddLowercaseUserIndexes < ActiveRecord::Migration[4.2] def up add_index :users, [], :columns => "LOWER(display_name)", :name => "users_display_name_lower_idx" diff --git a/db/migrate/20120214210114_add_text_format.rb b/db/migrate/20120214210114_add_text_format.rb index 6ec84ce44..be8089a74 100644 --- a/db/migrate/20120214210114_add_text_format.rb +++ b/db/migrate/20120214210114_add_text_format.rb @@ -1,5 +1,3 @@ -require "migrate" - class AddTextFormat < ActiveRecord::Migration[4.2] def up create_enumeration :format_enum, %w[html markdown text] diff --git a/db/migrate/20120318201948_create_redactions.rb b/db/migrate/20120318201948_create_redactions.rb index e108ea84b..3f6eec613 100644 --- a/db/migrate/20120318201948_create_redactions.rb +++ b/db/migrate/20120318201948_create_redactions.rb @@ -1,5 +1,3 @@ -require "migrate" - class CreateRedactions < ActiveRecord::Migration[4.2] def change create_table :redactions do |t| diff --git a/db/migrate/20120328090602_drop_session_table.rb b/db/migrate/20120328090602_drop_session_table.rb index 5423974e5..7046281df 100644 --- a/db/migrate/20120328090602_drop_session_table.rb +++ b/db/migrate/20120328090602_drop_session_table.rb @@ -1,5 +1,3 @@ -require "migrate" - class DropSessionTable < ActiveRecord::Migration[4.2] def up drop_table "sessions" diff --git a/db/migrate/20120404205604_add_user_and_description_to_redaction.rb b/db/migrate/20120404205604_add_user_and_description_to_redaction.rb index f23bd2ffc..56ef05253 100644 --- a/db/migrate/20120404205604_add_user_and_description_to_redaction.rb +++ b/db/migrate/20120404205604_add_user_and_description_to_redaction.rb @@ -1,5 +1,3 @@ -require "migrate" - class AddUserAndDescriptionToRedaction < ActiveRecord::Migration[4.2] def change add_column :redactions, :user_id, :bigint, :null => false diff --git a/db/migrate/20140115192822_add_text_index_to_note_comments.rb b/db/migrate/20140115192822_add_text_index_to_note_comments.rb index dc17d386e..1c30450ef 100644 --- a/db/migrate/20140115192822_add_text_index_to_note_comments.rb +++ b/db/migrate/20140115192822_add_text_index_to_note_comments.rb @@ -1,5 +1,3 @@ -require "migrate" - class AddTextIndexToNoteComments < ActiveRecord::Migration[4.2] def up add_index :note_comments, [], :columns => "to_tsvector('english', body)", :using => "GIN", :name => "index_note_comments_on_body" diff --git a/db/migrate/20140507110937_create_changeset_comments.rb b/db/migrate/20140507110937_create_changeset_comments.rb index fdcdaf65d..796919c51 100644 --- a/db/migrate/20140507110937_create_changeset_comments.rb +++ b/db/migrate/20140507110937_create_changeset_comments.rb @@ -1,5 +1,3 @@ -require "migrate" - class CreateChangesetComments < ActiveRecord::Migration[4.2] def change create_table :changeset_comments do |t| diff --git a/db/migrate/20140519141742_add_join_table_between_users_and_changesets.rb b/db/migrate/20140519141742_add_join_table_between_users_and_changesets.rb index c761af38b..221a740c5 100644 --- a/db/migrate/20140519141742_add_join_table_between_users_and_changesets.rb +++ b/db/migrate/20140519141742_add_join_table_between_users_and_changesets.rb @@ -1,5 +1,3 @@ -require "migrate" - class AddJoinTableBetweenUsersAndChangesets < ActiveRecord::Migration[4.2] def change create_table :changesets_subscribers, :id => false do |t| diff --git a/db/migrate/20160822153055_create_issues_and_reports.rb b/db/migrate/20160822153055_create_issues_and_reports.rb index 544ddbd60..07a549820 100644 --- a/db/migrate/20160822153055_create_issues_and_reports.rb +++ b/db/migrate/20160822153055_create_issues_and_reports.rb @@ -1,5 +1,3 @@ -require "migrate" - class CreateIssuesAndReports < ActiveRecord::Migration[5.0] def up create_enumeration :issue_status_enum, %w[open ignored resolved] diff --git a/db/migrate/20161002153425_add_join_table_between_users_and_diary_entries.rb b/db/migrate/20161002153425_add_join_table_between_users_and_diary_entries.rb index 624eb10f9..4151d19a3 100644 --- a/db/migrate/20161002153425_add_join_table_between_users_and_diary_entries.rb +++ b/db/migrate/20161002153425_add_join_table_between_users_and_diary_entries.rb @@ -1,5 +1,3 @@ -require "migrate" - class AddJoinTableBetweenUsersAndDiaryEntries < ActiveRecord::Migration[4.2] def self.up create_table :diary_entry_subscriptions, :id => false do |t| diff --git a/db/migrate/20201214144017_expand_nonce_id.rb b/db/migrate/20201214144017_expand_nonce_id.rb new file mode 100644 index 000000000..9416ffe6a --- /dev/null +++ b/db/migrate/20201214144017_expand_nonce_id.rb @@ -0,0 +1,7 @@ +class ExpandNonceId < ActiveRecord::Migration[6.0] + def change + safety_assured do + change_column :oauth_nonces, :id, :bigint + end + end +end diff --git a/db/structure.sql b/db/structure.sql index 5c33e4838..b5c4ec01d 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -1075,7 +1075,7 @@ ALTER SEQUENCE public.notes_id_seq OWNED BY public.notes.id; -- CREATE TABLE public.oauth_nonces ( - id integer NOT NULL, + id bigint NOT NULL, nonce character varying, "timestamp" integer, created_at timestamp without time zone, @@ -3147,6 +3147,7 @@ INSERT INTO "schema_migrations" (version) VALUES ('20191120140058'), ('20201006213836'), ('20201006220807'), +('20201214144017'), ('21'), ('22'), ('23'), diff --git a/lib/bootstrap_form/inputs/richtext_field.rb b/lib/bootstrap_form/inputs/richtext_field.rb new file mode 100644 index 000000000..a2256566f --- /dev/null +++ b/lib/bootstrap_form/inputs/richtext_field.rb @@ -0,0 +1,35 @@ +# frozen_string_literal: true + +# A custom richtext_field form group. By using form_group_builder we get to use +# the built-in methods for generating labels and help text. +module BootstrapForm + module Inputs + module RichtextField + extend ActiveSupport::Concern + include Base + + # It's not clear to me why this needs to be duplicated from the upstream BootstrapForm::FormBuilder class + delegate :content_tag, :capture, :concat, :tag, :to => :@template + + included do + def richtext_field_with_bootstrap(name, options = {}) + id = "#{@object_name}_#{name}" + type = options.delete(:format) || "markdown" + + form_group_builder(name, options) do + @template.render(:partial => "shared/richtext_field", + :locals => { :object => @object, + :attribute => name, + :object_name => @object_name, + :id => id, + :type => type, + :options => options, + :builder => self }) + end + end + + alias_method :richtext_field, :richtext_field_with_bootstrap + end + end + end +end diff --git a/lib/editors.rb b/lib/editors.rb index 6c0428724..e1c4054f3 100644 --- a/lib/editors.rb +++ b/lib/editors.rb @@ -1,4 +1,5 @@ module Editors ALL_EDITORS = %w[potlatch potlatch2 id remote].freeze - RECOMMENDED_EDITORS = %w[id potlatch2 remote].freeze + AVAILABLE_EDITORS = %w[id remote].freeze + RECOMMENDED_EDITORS = %w[id remote].freeze end diff --git a/lib/gpx.rb b/lib/gpx.rb index d0607233a..86cf2f49d 100644 --- a/lib/gpx.rb +++ b/lib/gpx.rb @@ -44,8 +44,8 @@ module GPX @tracksegs = 0 begin - Archive::Reader.open_filename(@file).each_entry_with_data do |_entry, data| - parse_file(XML::Reader.string(data), &block) + Archive::Reader.open_filename(@file).each_entry_with_data do |entry, data| + parse_file(XML::Reader.string(data), &block) if entry.regular? end rescue Archive::Error io = ::File.open(@file) diff --git a/lib/migrate.rb b/lib/migrate.rb deleted file mode 100644 index d87d14bbb..000000000 --- a/lib/migrate.rb +++ /dev/null @@ -1,57 +0,0 @@ -module OpenStreetMap - module ActiveRecord - module AbstractAdapter - def add_index_options(table_name, column_name, options = {}) - columns = options.delete(:columns) - index_name, index_type, index_columns, index_options, algorithm, using = super(table_name, column_name, options) - [index_name, index_type, columns || index_columns, index_options, algorithm, using] - end - end - - module PostgreSQLAdapter - def quote_column_name(name) - Array(name).map { |n| super(n) }.join(", ") - end - - def add_primary_key(table_name, column_name, _options = {}) - table_name = quote_table_name(table_name) - column_name = quote_column_name(column_name) - - execute "ALTER TABLE #{table_name} ADD PRIMARY KEY (#{column_name})" - end - - def remove_primary_key(table_name) - table_name = quote_table_name(table_name) - - execute "ALTER TABLE #{table_name} DROP PRIMARY KEY" - end - - def alter_primary_key(table_name, new_columns) - constraint_name = quote_table_name("#{table_name}_pkey") - table_name = quote_table_name(table_name) - new_columns = quote_column_name(new_columns) - - execute "ALTER TABLE #{table_name} DROP CONSTRAINT #{constraint_name}" - execute "ALTER TABLE #{table_name} ADD PRIMARY KEY (#{new_columns})" - end - - def create_enumeration(enumeration_name, values) - execute "CREATE TYPE #{enumeration_name} AS ENUM ('#{values.join '\',\''}')" - end - - def drop_enumeration(enumeration_name) - execute "DROP TYPE #{enumeration_name}" - end - - def rename_enumeration(old_name, new_name) - old_name = quote_table_name(old_name) - new_name = quote_table_name(new_name) - - execute "ALTER TYPE #{old_name} RENAME TO #{new_name}" - end - end - end -end - -ActiveRecord::ConnectionAdapters::AbstractAdapter.prepend(OpenStreetMap::ActiveRecord::AbstractAdapter) -ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(OpenStreetMap::ActiveRecord::PostgreSQLAdapter) diff --git a/lib/nominatim.rb b/lib/nominatim.rb index ffa86d93f..fd0855fc9 100644 --- a/lib/nominatim.rb +++ b/lib/nominatim.rb @@ -1,4 +1,6 @@ module Nominatim + require "timeout" + extend ActionView::Helpers::NumberHelper def self.describe_location(lat, lon, zoom = nil, language = nil) @@ -9,7 +11,7 @@ module Nominatim url = "https://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}" begin - response = OSM::Timer.timeout(4) do + response = Timeout.timeout(4) do REXML::Document.new(Net::HTTP.get(URI.parse(url))) end rescue StandardError diff --git a/lib/osm.rb b/lib/osm.rb index a6d740677..b6dd64b99 100644 --- a/lib/osm.rb +++ b/lib/osm.rb @@ -5,13 +5,6 @@ module OSM require "rexml/text" require "xml/libxml" - if defined?(SystemTimer) - Timer = SystemTimer - else - require "timeout" - Timer = Timeout - end - # The base class for API Errors. class APIError < RuntimeError def initialize(message = "Generic API Error") @@ -378,12 +371,17 @@ module OSM end # and these two will give you the right points on your image. all the constants can be reduced to speed things up. FIXME + # If the bbox has no extent, return the centre of the image to avoid dividing by zero. def y(lat) + return @height / 2 if (@by - @ty).zero? + @height - ((ysheet(lat) - @ty) / (@by - @ty) * @height) end def x(lon) + return @width / 2 if (@bx - @tx).zero? + ((xsheet(lon) - @tx) / (@bx - @tx) * @width) end end diff --git a/lib/potlatch.rb b/lib/potlatch.rb deleted file mode 100644 index 605d69db3..000000000 --- a/lib/potlatch.rb +++ /dev/null @@ -1,263 +0,0 @@ -require "stringio" - -# The Potlatch module provides helper functions for potlatch and its communication with the server -module Potlatch - # The AMF class is a set of helper functions for encoding and decoding AMF. - class AMF - # Return two-byte integer - def self.getint(s) - s.getbyte * 256 + s.getbyte - end - - # Return four-byte long - def self.getlong(s) - ((s.getbyte * 256 + s.getbyte) * 256 + s.getbyte) * 256 + s.getbyte - end - - # Return string with two-byte length - def self.getstring(s) - len = s.getbyte * 256 + s.getbyte - str = s.read(len) - str.force_encoding("UTF-8") if str.respond_to?("force_encoding") - str - end - - # Return eight-byte double-precision float - def self.getdouble(s) - a = s.read(8).unpack("G") # G big-endian, E little-endian - a[0] - end - - # Return numeric array - def self.getarray(s) - Array.new(getlong(s)) { getvalue(s) } - end - - # Return object/hash - def self.getobject(s) - arr = {} - while (key = getstring(s)) - break if key == "" - - arr[key] = getvalue(s) - end - s.getbyte # skip the 9 'end of object' value - arr - end - - # Parse and get value - def self.getvalue(s) - case s.getbyte - when 0 then getdouble(s) # number - when 1 then s.getbyte # boolean - when 2 then getstring(s) # string - when 3 then getobject(s) # object/hash - when 5 then nil # null - when 6 then nil # undefined - when 8 then s.read(4) # mixedArray - getobject(s) # | - when 10 then getarray(s) # array - end - end - - # Envelope data into AMF writeable form - def self.putdata(index, n) - d = encodestring("#{index}/onResult") - d += encodestring("null") - d += [-1].pack("N") - d += encodevalue(n) - d - end - - # Pack variables as AMF - def self.encodevalue(n) - case n - when Array - a = 10.chr + encodelong(n.length) - n.each do |b| - a += encodevalue(b) - end - a - when Hash - a = 3.chr - n.each do |k, v| - a += encodestring(k.to_s) + encodevalue(v) - end - a + 0.chr + 0.chr + 9.chr - when String - 2.chr + encodestring(n) - when Numeric, GeoRecord::Coord - 0.chr + encodedouble(n) - when NilClass - 5.chr - when TrueClass - 0.chr + encodedouble(1) - when FalseClass - 0.chr + encodedouble(0) - else - raise "Unexpected Ruby type for AMF conversion: #{n.class.name}" - end - end - - # Encode string with two-byte length - def self.encodestring(n) - n = n.dup.force_encoding("ASCII-8BIT") if n.respond_to?("force_encoding") - a, b = n.size.divmod(256) - a.chr + b.chr + n - end - - # Encode number as eight-byte double precision float - def self.encodedouble(n) - [n.to_f].pack("G") - end - - # Encode number as four-byte long - def self.encodelong(n) - [n].pack("N") - end - end - - # The Dispatcher class handles decoding a series of RPC calls - # from the request, dispatching them, and encoding the response - class Dispatcher - def initialize(request, &block) - # Get stream for request data - @request = StringIO.new(request + 0.chr) - - # Skip version indicator and client ID - @request.read(2) - - # Skip headers - AMF.getint(@request).times do # Read number of headers and loop - AMF.getstring(@request) # | skip name - req.getbyte # | skip boolean - AMF.getvalue(@request) # | skip value - end - - # Capture the dispatch routine - @dispatch = block - end - - def each(&_block) - # Read number of message bodies - bodies = AMF.getint(@request) - - # Output response header - a, b = bodies.divmod(256) - yield 0.chr * 4 + a.chr + b.chr - - # Process the bodies - bodies.times do # Read each body - name = AMF.getstring(@request) # | get message name - index = AMF.getstring(@request) # | get index in response sequence - AMF.getlong(@request) # | get total size in bytes - args = AMF.getvalue(@request) # | get response (probably an array) - - result = @dispatch.call(name, *args) - - yield AMF.putdata(index, result) - end - end - end - - # The Potlatch class is a helper for Potlatch - class Potlatch - # ----- getpresets - # in: none - # does: reads tag preset menus, colours, and autocomplete config files - # out: [0] presets, [1] presetmenus, [2] presetnames, - # [3] colours, [4] casing, [5] areas, [6] autotags - # (all hashes) - def self.get_presets - Rails.logger.info(" Message: getpresets") - - # Read preset menus - presets = {} - presetmenus = { "point" => [], "way" => [], "POI" => [] } - presetnames = { "point" => {}, "way" => {}, "POI" => {} } - presettype = "" - presetcategory = "" - # StringIO.open(txt) do |file| - File.open(Rails.root.join("config/potlatch/presets.txt")) do |file| - file.each_line do |line| - case line.chomp - when %r{(\w+)/(\w+)} - presettype = Regexp.last_match(1) - presetcategory = Regexp.last_match(2) - presetmenus[presettype].push(presetcategory) - presetnames[presettype][presetcategory] = ["(no preset)"] - when /^([\w\s]+):\s?(.+)$/ - pre = Regexp.last_match(1) - kv = Regexp.last_match(2) - presetnames[presettype][presetcategory].push(pre) - presets[pre] = {} - kv.split(",").each do |a| - presets[pre][Regexp.last_match(1)] = Regexp.last_match(2) if a =~ /^(.+)=(.*)$/ - end - end - end - end - - # Read colours/styling - colours = {} - casing = {} - areas = {} - File.open(Rails.root.join("config/potlatch/colours.txt")) do |file| - file.each_line do |line| - next unless line.chomp =~ /(\w+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)/ - - tag = Regexp.last_match(1) - colours[tag] = Regexp.last_match(2).hex if Regexp.last_match(2) != "-" - casing[tag] = Regexp.last_match(3).hex if Regexp.last_match(3) != "-" - areas[tag] = Regexp.last_match(4).hex if Regexp.last_match(4) != "-" - end - end - - # Read relations colours/styling - relcolours = {} - relalphas = {} - relwidths = {} - File.open(Rails.root.join("config/potlatch/relation_colours.txt")) do |file| - file.each_line do |line| - next unless line.chomp =~ /(\w+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)/ - - tag = Regexp.last_match(1) - relcolours[tag] = Regexp.last_match(2).hex if Regexp.last_match(2) != "-" - relalphas[tag] = Regexp.last_match(3).to_i if Regexp.last_match(3) != "-" - relwidths[tag] = Regexp.last_match(4).to_i if Regexp.last_match(4) != "-" - end - end - - # Read POI presets - icon_list = [] - icon_tags = {} - File.open(Rails.root.join("config/potlatch/icon_presets.txt")) do |file| - file.each_line do |line| - (icon, tags) = line.chomp.split("\t") - icon_list.push(icon) - icon_tags[icon] = Hash[*tags.scan(/([^;=]+)=([^;=]+)/).flatten] - end - end - icon_list.reverse! - - # Read auto-complete - autotags = { "point" => {}, "way" => {}, "POI" => {} } - File.open(Rails.root.join("config/potlatch/autocomplete.txt")) do |file| - file.each_line do |line| - next unless line.chomp =~ %r{^([\w:]+)/(\w+)\s+(.+)$} - - tag = Regexp.last_match(1) - type = Regexp.last_match(2) - values = Regexp.last_match(3) - autotags[type][tag] = if values == "-" - [] - else - values.split(",").sort.reverse - end - end - end - - [presets, presetmenus, presetnames, colours, casing, areas, autotags, relcolours, relalphas, relwidths, icon_list, {}, icon_tags] - end - end -end diff --git a/lib/potlatch2.rb b/lib/potlatch2.rb deleted file mode 100644 index e7c1af944..000000000 --- a/lib/potlatch2.rb +++ /dev/null @@ -1,109 +0,0 @@ -module Potlatch2 - LOCALES = { - "af" => "af", - "ar" => "ar", - "arc" => "arc", - "ast" => "ast", - "az" => "az", - "ba" => "ba", - "be" => "be", - "be-Tarask" => "be-tarask", - "bg" => "bg", - "bn" => "bn", - "br" => "br", - "bs" => "bs", - "ca" => "ca", - "ce" => "ce", - "cs" => "cs_CZ", - "cy" => "cy", - "da" => "da", - "de" => "de_DE", - "de-Formal" => "de-formal", - "diq" => "diq", - "dsb" => "dsb", - "en" => "en_US", - "en-GB" => "en_GB", - "el" => "el", - "eo" => "eo", - "es" => "es_ES", - "et" => "et", - "eu" => "eu", - "fa" => "fa", - "fi" => "fi", - "fo" => "fo", - "fr" => "fr_FR", - "fur" => "fur", - "fy" => "fy", - "ga" => "ga", - "gd" => "gd", - "gl" => "gl", - "grc" => "grc", - "he" => "he", - "hr" => "hr", - "hsb" => "hsb", - "hu" => "hu", - "ia" => "ia", - "id" => "id", - "is" => "is", - "it" => "it_IT", - "ja" => "ja_JP", - "ka" => "ka", - "kab" => "kab", - "km" => "km", - "kn" => "kn", - "ko" => "ko", - "krc" => "krc", - "ksh" => "ksh", - "ku-Latn" => "ku-latn", - "ky" => "ky", - "lb" => "lb", - "lez" => "lez", - "lt" => "lt", - "lv" => "lv", - "lzz" => "lzz", - "mg" => "mg", - "mk" => "mk", - "mr" => "mr", - "ms" => "ms", - "my" => "my", - "nb" => "nb_NO", - "ne" => "ne", - "nl" => "nl_NL", - "nn" => "nn_NO", - "no" => "nb_NO", - "oc" => "oc", - "pa" => "pa", - "pl" => "pl_PL", - "ps" => "ps", - "pt" => "pt_PT", - "pt-BR" => "pt_BR", - "ro" => "ro", - "ru" => "ru", - "rue" => "rue", - "sah" => "sah", - "scn" => "scn", - "shn" => "shn", - "sk" => "sk", - "skr" => "skr-arab", - "sl" => "sl", - "sq" => "sq", - "sr" => "sr-ec", - "sr-Latn" => "sr-el", - "sty" => "sty", - "sv" => "sv_SE", - "ta" => "ta", - "te" => "te", - "th" => "th", - "tl" => "tl", - "tly" => "tly", - "tr" => "tr", - "tyv" => "tyv", - "tzm" => "tzm", - "uk" => "uk", - "vi" => "vi_VN", - "vo" => "vo", - "yi" => "yi", - "zh" => "zh_CN", - "zh-TW" => "zh_TW" - }.freeze -end diff --git a/public/potlatch/beep.mp3 b/public/potlatch/beep.mp3 deleted file mode 100644 index b4e86c20f..000000000 Binary files a/public/potlatch/beep.mp3 and /dev/null differ diff --git a/public/potlatch/help.css b/public/potlatch/help.css deleted file mode 100644 index 99ae8c1ce..000000000 --- a/public/potlatch/help.css +++ /dev/null @@ -1,14 +0,0 @@ -headline { font-family: Arial,Helvetica,sans-serif; - font-size: 18px; - color: #DDDDFF; } - -largeText { font-family: Arial,Helvetica,sans-serif; - font-size: 12px; - color: #FFFFFF; } - -bodyText { font-family: Arial,Helvetica,sans-serif; - font-size: 10px; - color: #FFFFFF; } - -a:link { color: #00FFFF; - text-decoration: underline; } diff --git a/public/potlatch/photos.css b/public/potlatch/photos.css deleted file mode 100644 index cc7dd42e4..000000000 --- a/public/potlatch/photos.css +++ /dev/null @@ -1,18 +0,0 @@ -h1 { font-family: Arial,Helvetica,sans-serif; - font-size: 18px; - color: #DDDDFF; } - -h2 { font-family: Arial,Helvetica,sans-serif; - font-size: 16px; - color: #DDDDFF; } - -h3 { font-family: Arial,Helvetica,sans-serif; - font-size: 14px; - color: #DDDDFF; } - -p { font-family: Arial,Helvetica,sans-serif; - font-size: 12px; - color: #FFFFFF; } - -a:link { color: #00FFFF; - text-decoration: underline; } diff --git a/public/potlatch/potlatch.swf b/public/potlatch/potlatch.swf deleted file mode 100644 index 973149b9a..000000000 Binary files a/public/potlatch/potlatch.swf and /dev/null differ diff --git a/public/potlatch/tags.css b/public/potlatch/tags.css deleted file mode 100644 index 186604acf..000000000 --- a/public/potlatch/tags.css +++ /dev/null @@ -1,10 +0,0 @@ -h2 { font-family: Arial,Helvetica,sans-serif; - font-size: 14px; - color: #DDDDFF; } - -p { font-family: Arial,Helvetica,sans-serif; - font-size: 12px; - color: #FFFFFF; } - -a:link { color: #00FFFF; - text-decoration: underline; } diff --git a/public/potlatch/ymap.swf b/public/potlatch/ymap.swf deleted file mode 100644 index 873fc3ed2..000000000 Binary files a/public/potlatch/ymap.swf and /dev/null differ diff --git a/public/potlatch/ymap2.swf b/public/potlatch/ymap2.swf deleted file mode 100644 index b1783d355..000000000 Binary files a/public/potlatch/ymap2.swf and /dev/null differ diff --git a/script/normalise-structure b/script/normalise-structure new file mode 100644 index 000000000..9cf0b6cae --- /dev/null +++ b/script/normalise-structure @@ -0,0 +1,10 @@ +/^$/d +/^--/d +/^CREATE EXTENSION IF NOT EXISTS plpgsql /d +/^COMMENT ON EXTENSION plpgsql /d +/^SET default_with_oids /d +/^SET default_table_access_method /d +/^SET idle_in_transaction_session_timeout /d +/^ AS integer$/d + +s/ IMMUTABLE / / diff --git a/script/statistics b/script/statistics index 33205fe62..cd9e9afa7 100755 --- a/script/statistics +++ b/script/statistics @@ -86,7 +86,7 @@ rescue StandardError => e puts "

Exception: #{e}
#{e.backtrace.join('
')}

" end -puts "

Report took #{(Time.new - start_time)} seconds to run

" +puts "

Report took #{Time.new - start_time} seconds to run

" puts "" puts "" diff --git a/test/controllers/api/amf_controller_test.rb b/test/controllers/api/amf_controller_test.rb deleted file mode 100644 index 47cced6ff..000000000 --- a/test/controllers/api/amf_controller_test.rb +++ /dev/null @@ -1,1464 +0,0 @@ -require "test_helper" - -module Api - class AmfControllerTest < ActionDispatch::IntegrationTest - include Potlatch - - ## - # test all routes which lead to this controller - def test_routes - assert_routing( - { :path => "/api/0.6/amf/read", :method => :post }, - { :controller => "api/amf", :action => "amf_read" } - ) - assert_routing( - { :path => "/api/0.6/amf/write", :method => :post }, - { :controller => "api/amf", :action => "amf_write" } - ) - end - - def test_getpresets - user_en_de = create(:user, :languages => %w[en de]) - user_de = create(:user, :languages => %w[de]) - [user_en_de, user_de].each do |user| - post amf_read_path, amf_content("getpresets", "/1", ["#{user.email}:test", ""]) - assert_response :success - amf_parse_response - presets = amf_result("/1") - - assert_equal 15, presets.length - assert_equal POTLATCH_PRESETS[0], presets[0] - assert_equal POTLATCH_PRESETS[1], presets[1] - assert_equal POTLATCH_PRESETS[2], presets[2] - assert_equal POTLATCH_PRESETS[3], presets[3] - assert_equal POTLATCH_PRESETS[4], presets[4] - assert_equal POTLATCH_PRESETS[5], presets[5] - assert_equal POTLATCH_PRESETS[6], presets[6] - assert_equal POTLATCH_PRESETS[7], presets[7] - assert_equal POTLATCH_PRESETS[8], presets[8] - assert_equal POTLATCH_PRESETS[9], presets[9] - assert_equal POTLATCH_PRESETS[10], presets[10] - assert_equal POTLATCH_PRESETS[12], presets[12] - assert_equal user.languages.first, presets[13]["__potlatch_locale"] - end - end - - def test_getway - # check a visible way - way = create(:way_with_nodes, :nodes_count => 1) - node = way.nodes.first - user = way.changeset.user - - post amf_read_path, amf_content("getway", "/1", [way.id]) - assert_response :success - amf_parse_response - result = amf_result("/1") - assert_equal 0, result[0] - assert_equal "", result[1] - assert_equal way.id, result[2] - assert_equal 1, result[3].length - assert_equal node.id, result[3][0][2] - assert_equal way.version, result[5] - assert_equal user.id, result[6] - end - - def test_getway_invisible - # check an invisible way - id = create(:way, :deleted).id - - post amf_read_path, amf_content("getway", "/1", [id]) - assert_response :success - amf_parse_response - result = amf_result("/1") - assert_equal(-4, result[0]) - assert_equal "way", result[1] - assert_equal id, result[2] - assert(result[3].nil? && result[4].nil? && result[5].nil? && result[6].nil?) - end - - def test_getway_with_versions - # check a way with multiple versions - way = create(:way, :with_history, :version => 4) - create(:way_node, :way => way) - node = way.nodes.first - user = way.changeset.user - - post amf_read_path, amf_content("getway", "/1", [way.id]) - assert_response :success - amf_parse_response - result = amf_result("/1") - assert_equal 0, result[0] - assert_equal "", result[1] - assert_equal way.id, result[2] - assert_equal 1, result[3].length - assert_equal node.id, result[3][0][2] - assert_equal way.version, result[5] - assert_equal user.id, result[6] - end - - def test_getway_with_duplicate_nodes - # check a way with duplicate nodes - way = create(:way) - node = create(:node) - create(:way_node, :way => way, :node => node, :sequence_id => 1) - create(:way_node, :way => way, :node => node, :sequence_id => 2) - user = way.changeset.user - - post amf_read_path, amf_content("getway", "/1", [way.id]) - assert_response :success - amf_parse_response - result = amf_result("/1") - assert_equal 0, result[0] - assert_equal "", result[1] - assert_equal way.id, result[2] - assert_equal 2, result[3].length - assert_equal node.id, result[3][0][2] - assert_equal node.id, result[3][1][2] - assert_equal way.version, result[5] - assert_equal user.id, result[6] - end - - def test_getway_with_multiple_nodes - # check a way with multiple nodes - way = create(:way_with_nodes, :nodes_count => 3) - a = way.nodes[0].id - b = way.nodes[1].id - c = way.nodes[2].id - user = way.changeset.user - - post amf_read_path, amf_content("getway", "/1", [way.id]) - assert_response :success - amf_parse_response - result = amf_result("/1") - assert_equal 0, result[0] - assert_equal "", result[1] - assert_equal way.id, result[2] - assert_equal 3, result[3].length - assert_equal a, result[3][0][2] - assert_equal b, result[3][1][2] - assert_equal c, result[3][2][2] - assert_equal way.version, result[5] - assert_equal user.id, result[6] - end - - def test_getway_nonexistent - # check chat a non-existent way is not returned - post amf_read_path, amf_content("getway", "/1", [0]) - assert_response :success - amf_parse_response - way = amf_result("/1") - assert_equal(-4, way[0]) - assert_equal "way", way[1] - assert_equal 0, way[2] - assert(way[3].nil?) && way[4].nil? && way[5].nil? && way[6].nil? - end - - def test_whichways - node = create(:node, :lat => 3.0, :lon => 3.0) - way = create(:way) - deleted_way = create(:way, :deleted) - create(:way_node, :way => way, :node => node) - create(:way_node, :way => deleted_way, :node => node) - create(:way_tag, :way => way) - - minlon = node.lon - 0.1 - minlat = node.lat - 0.1 - maxlon = node.lon + 0.1 - maxlat = node.lat + 0.1 - post amf_read_path, amf_content("whichways", "/1", [minlon, minlat, maxlon, maxlat]) - assert_response :success - amf_parse_response - - # check contents of message - map = amf_result "/1" - assert_equal 0, map[0], "map error code should be 0" - assert_equal "", map[1], "map error text should be empty" - - # check the formatting of the message - assert_equal 5, map.length, "map should have length 5" - assert_equal Array, map[2].class, 'map "ways" element should be an array' - assert_equal Array, map[3].class, 'map "nodes" element should be an array' - assert_equal Array, map[4].class, 'map "relations" element should be an array' - map[2].each do |w| - assert_equal 2, w.length, "way should be (id, version) pair" - assert_equal w[0], w[0].floor, "way ID should be an integer" - assert_equal w[1], w[1].floor, "way version should be an integer" - end - - map[3].each do |n| - assert_equal 5, w.length, "node should be (id, lat, lon, [tags], version) tuple" - assert_equal n[0], n[0].floor, "node ID should be an integer" - assert n[1] >= minlat - 0.01, "node lat should be greater than min" - assert n[1] <= maxlat - 0.01, "node lat should be less than max" - assert n[2] >= minlon - 0.01, "node lon should be greater than min" - assert n[2] <= maxlon - 0.01, "node lon should be less than max" - assert_equal Array, a[3].class, "node tags should be array" - assert_equal n[4], n[4].floor, "node version should be an integer" - end - - map[4].each do |r| - assert_equal 2, r.length, "relation should be (id, version) pair" - assert_equal r[0], r[0].floor, "relation ID should be an integer" - assert_equal r[1], r[1].floor, "relation version should be an integer" - end - - # TODO: looks like amf_controller changed since this test was written - # so someone who knows what they're doing should check this! - ways = map[2].collect { |x| x[0] } - assert_includes ways, way.id, - "map should include used way" - assert_not ways.include?(deleted_way.id), - "map should not include deleted way" - end - - ## - # checks that too-large a bounding box will not be served. - def test_whichways_toobig - bbox = [-0.1, -0.1, 1.1, 1.1] - check_bboxes_are_bad [bbox] do |map, _bbox| - assert_boundary_error map, " The server said: The maximum bbox size is 0.25, and your request was too large. Either request a smaller area, or use planet.osm" - end - end - - ## - # checks that an invalid bounding box will not be served. in this case - # one with max < min latitudes. - # - # NOTE: the controller expands the bbox by 0.01 in each direction! - def test_whichways_badlat - bboxes = [[0, 0.1, 0.1, 0], [-0.1, 80, 0.1, 70], [0.24, 54.35, 0.25, 54.33]] - check_bboxes_are_bad bboxes do |map, bbox| - assert_boundary_error map, " The server said: The minimum latitude must be less than the maximum latitude, but it wasn't", bbox.inspect - end - end - - ## - # same as test_whichways_badlat, but for longitudes - # - # NOTE: the controller expands the bbox by 0.01 in each direction! - def test_whichways_badlon - bboxes = [[80, -0.1, 70, 0.1], [54.35, 0.24, 54.33, 0.25]] - check_bboxes_are_bad bboxes do |map, bbox| - assert_boundary_error map, " The server said: The minimum longitude must be less than the maximum longitude, but it wasn't", bbox.inspect - end - end - - def test_whichways_deleted - node = create(:node, :with_history, :lat => 24.0, :lon => 24.0) - way = create(:way, :with_history) - way_v1 = way.old_ways.find_by(:version => 1) - deleted_way = create(:way, :with_history, :deleted) - deleted_way_v1 = deleted_way.old_ways.find_by(:version => 1) - create(:way_node, :way => way, :node => node) - create(:way_node, :way => deleted_way, :node => node) - create(:old_way_node, :old_way => way_v1, :node => node) - create(:old_way_node, :old_way => deleted_way_v1, :node => node) - - minlon = node.lon - 0.1 - minlat = node.lat - 0.1 - maxlon = node.lon + 0.1 - maxlat = node.lat + 0.1 - post amf_read_path, amf_content("whichways_deleted", "/1", [minlon, minlat, maxlon, maxlat]) - assert_response :success - amf_parse_response - - # check contents of message - map = amf_result "/1" - assert_equal 0, map[0], "first map element should be 0" - assert_equal "", map[1], "second map element should be an empty string" - assert_equal Array, map[2].class, "third map element should be an array" - # TODO: looks like amf_controller changed since this test was written - # so someone who knows what they're doing should check this! - assert_not map[2].include?(way.id), - "map should not include visible way" - assert_includes map[2], deleted_way.id, - "map should include deleted way" - end - - def test_whichways_deleted_toobig - bbox = [-0.1, -0.1, 1.1, 1.1] - post amf_read_path, amf_content("whichways_deleted", "/1", bbox) - assert_response :success - amf_parse_response - - map = amf_result "/1" - assert_deleted_boundary_error map, " The server said: The maximum bbox size is 0.25, and your request was too large. Either request a smaller area, or use planet.osm" - end - - def test_getrelation - id = create(:relation).id - post amf_read_path, amf_content("getrelation", "/1", [id]) - assert_response :success - amf_parse_response - rel = amf_result("/1") - assert_equal(0, rel[0]) - assert_equal rel[2], id - end - - def test_getrelation_invisible - id = create(:relation, :deleted).id - post amf_read_path, amf_content("getrelation", "/1", [id]) - assert_response :success - amf_parse_response - rel = amf_result("/1") - assert_equal(-4, rel[0]) - assert_equal("relation", rel[1]) - assert_equal rel[2], id - assert(rel[3].nil?) && rel[4].nil? - end - - def test_getrelation_nonexistent - id = 0 - post amf_read_path, amf_content("getrelation", "/1", [id]) - assert_response :success - amf_parse_response - rel = amf_result("/1") - assert_equal(-4, rel[0]) - assert_equal("relation", rel[1]) - assert_equal rel[2], id - assert(rel[3].nil?) && rel[4].nil? - end - - def test_getway_old - latest = create(:way, :version => 2) - v1 = create(:old_way, :current_way => latest, :version => 1, :timestamp => Time.now.utc - 2.minutes) - _v2 = create(:old_way, :current_way => latest, :version => 2, :timestamp => Time.now.utc - 1.minute) - - # try to get the last visible version (specified by <0) (should be current version) - # NOTE: looks from the API changes that this now expects a timestamp - # instead of a version number... - # try to get version 1 - { latest.id => "", - v1.way_id => (v1.timestamp + 1).strftime("%d %b %Y, %H:%M:%S") }.each do |id, t| - post amf_read_path, amf_content("getway_old", "/1", [id, t]) - assert_response :success - amf_parse_response - returned_way = amf_result("/1") - assert_equal 0, returned_way[0] - assert_equal id, returned_way[2] - # API returns the *latest* version, even for old ways... - assert_equal latest.version, returned_way[5] - end - end - - ## - # test that the server doesn't fall over when rubbish is passed - # into the method args. - def test_getway_old_invalid - way_id = create(:way, :with_history, :version => 2).id - { "foo" => "bar", - way_id => "not a date", - way_id => "2009-03-25 00:00:00", # <- wrong format - way_id => "0 Jan 2009 00:00:00", # <- invalid date - -1 => "1 Jan 2009 00:00:00" }.each do |id, t| # <- invalid - post amf_read_path, amf_content("getway_old", "/1", [id, t]) - assert_response :success - amf_parse_response - returned_way = amf_result("/1") - assert_equal(-1, returned_way[0]) - assert returned_way[3].nil? - assert returned_way[4].nil? - assert returned_way[5].nil? - end - end - - def test_getway_old_nonexistent - # try to get the last version-10 (shoudn't exist) - way = create(:way, :with_history, :version => 2) - v1 = way.old_ways.find_by(:version => 1) - # try to get last visible version of non-existent way - # try to get specific version of non-existent way - [[0, ""], - [0, "1 Jan 1970, 00:00:00"], - [v1.way_id, (v1.timestamp - 10).strftime("%d %b %Y, %H:%M:%S")]].each do |id, t| - post amf_read_path, amf_content("getway_old", "/1", [id, t]) - assert_response :success - amf_parse_response - returned_way = amf_result("/1") - assert_equal(-1, returned_way[0]) - assert returned_way[3].nil? - assert returned_way[4].nil? - assert returned_way[5].nil? - end - end - - def test_getway_old_invisible - way = create(:way, :deleted, :with_history, :version => 1) - v1 = way.old_ways.find_by(:version => 1) - # try to get deleted version - [[v1.way_id, (v1.timestamp + 10).strftime("%d %b %Y, %H:%M:%S")]].each do |id, t| - post amf_read_path, amf_content("getway_old", "/1", [id, t]) - assert_response :success - amf_parse_response - returned_way = amf_result("/1") - assert_equal(-1, returned_way[0]) - assert returned_way[3].nil? - assert returned_way[4].nil? - assert returned_way[5].nil? - end - end - - def test_getway_history - latest = create(:way, :version => 2) - oldest = create(:old_way, :current_way => latest, :version => 1, :timestamp => latest.timestamp - 2.minutes) - create(:old_way, :current_way => latest, :version => 2, :timestamp => latest.timestamp) - - post amf_read_path, amf_content("getway_history", "/1", [latest.id]) - assert_response :success - amf_parse_response - history = amf_result("/1") - - # ['way',wayid,history] - assert_equal "way", history[0] - assert_equal latest.id, history[1] - # We use dates rather than version numbers here, because you might - # have moved a node within a way (i.e. way version not incremented). - # The timestamp is +1 because we say "give me the revision of 15:33:02", - # but that might actually include changes at 15:33:02.457. - assert_equal (latest.timestamp + 1).strftime("%d %b %Y, %H:%M:%S"), history[2].first[0] - assert_equal (oldest.timestamp + 1).strftime("%d %b %Y, %H:%M:%S"), history[2].last[0] - end - - def test_getway_history_nonexistent - post amf_read_path, amf_content("getway_history", "/1", [0]) - assert_response :success - amf_parse_response - history = amf_result("/1") - - # ['way',wayid,history] - assert_equal("way", history[0]) - assert_equal(0, history[1]) - assert_empty history[2] - end - - def test_getnode_history - node = create(:node, :version => 2) - node_v1 = create(:old_node, :current_node => node, :version => 1, :timestamp => 3.days.ago) - _node_v2 = create(:old_node, :current_node => node, :version => 2, :timestamp => 2.days.ago) - node_v3 = create(:old_node, :current_node => node, :version => 3, :timestamp => 1.day.ago) - - post amf_read_path, amf_content("getnode_history", "/1", [node.id]) - assert_response :success - amf_parse_response - history = amf_result("/1") - - # ['node',nodeid,history] - # note that (as per getway_history) we actually round up - # to the next second - assert_equal("node", history[0], 'first element should be "node"') - assert_equal history[1], node.id, - "second element should be the input node ID" - assert_equal history[2].first[0], - (node_v3.timestamp + 1).strftime("%d %b %Y, %H:%M:%S"), - "first element in third element (array) should be the latest version" - assert_equal history[2].last[0], - (node_v1.timestamp + 1).strftime("%d %b %Y, %H:%M:%S"), - "last element in third element (array) should be the initial version" - end - - def test_getnode_history_nonexistent - post amf_read_path, amf_content("getnode_history", "/1", [0]) - assert_response :success - amf_parse_response - history = amf_result("/1") - - # ['node',nodeid,history] - assert_equal("node", history[0]) - assert_equal(0, history[1]) - assert_empty history[2] - end - - def test_findgpx_bad_user - post amf_read_path, amf_content("findgpx", "/1", [1, "test@example.com:wrong"]) - assert_response :success - amf_parse_response - result = amf_result("/1") - - assert_equal 2, result.length - assert_equal(-1, result[0]) - assert_match(/must be logged in/, result[1]) - - blocked_user = create(:user) - create(:user_block, :user => blocked_user) - post amf_read_path, amf_content("findgpx", "/1", [1, "#{blocked_user.email}:test"]) - assert_response :success - amf_parse_response - result = amf_result("/1") - - assert_equal 2, result.length - assert_equal(-1, result[0]) - assert_match(/access to the API has been blocked/, result[1]) - end - - def test_findgpx_by_id - user = create(:user) - trace = create(:trace, :visibility => "private", :user => user) - - post amf_read_path, amf_content("findgpx", "/1", [trace.id, "#{user.email}:test"]) - assert_response :success - amf_parse_response - result = amf_result("/1") - - assert_equal 3, result.length - assert_equal 0, result[0] - assert_equal "", result[1] - traces = result[2] - assert_equal 1, traces.length - assert_equal 3, traces[0].length - assert_equal trace.id, traces[0][0] - assert_equal trace.name, traces[0][1] - assert_equal trace.description, traces[0][2] - end - - def test_findgpx_by_name - user = create(:user) - - post amf_read_path, amf_content("findgpx", "/1", ["Trace", "#{user.email}:test"]) - assert_response :success - amf_parse_response - result = amf_result("/1") - - # find by name fails as it uses mysql text search syntax... - assert_equal 2, result.length - assert_equal(-2, result[0]) - end - - def test_findrelations_by_id - relation = create(:relation, :version => 4) - - post amf_read_path, amf_content("findrelations", "/1", [relation.id]) - assert_response :success - amf_parse_response - result = amf_result("/1") - - assert_equal 1, result.length - assert_equal 4, result[0].length - assert_equal relation.id, result[0][0] - assert_equal relation.tags, result[0][1] - assert_equal relation.members, result[0][2] - assert_equal relation.version, result[0][3] - - post amf_read_path, amf_content("findrelations", "/1", [999999]) - assert_response :success - amf_parse_response - result = amf_result("/1") - - assert_equal 0, result.length - end - - def test_findrelations_by_tags - visible_relation = create(:relation) - create(:relation_tag, :relation => visible_relation, :k => "test", :v => "yes") - used_relation = create(:relation) - super_relation = create(:relation) - create(:relation_member, :relation => super_relation, :member => used_relation) - create(:relation_tag, :relation => used_relation, :k => "test", :v => "yes") - create(:relation_tag, :relation => used_relation, :k => "name", :v => "Test Relation") - - post amf_read_path, amf_content("findrelations", "/1", ["yes"]) - assert_response :success - amf_parse_response - result = amf_result("/1").sort - - assert_equal 2, result.length - assert_equal 4, result[0].length - assert_equal visible_relation.id, result[0][0] - assert_equal visible_relation.tags, result[0][1] - assert_equal visible_relation.members, result[0][2] - assert_equal visible_relation.version, result[0][3] - assert_equal 4, result[1].length - assert_equal used_relation.id, result[1][0] - assert_equal used_relation.tags, result[1][1] - assert_equal used_relation.members, result[1][2] - assert_equal used_relation.version, result[1][3] - - post amf_read_path, amf_content("findrelations", "/1", ["no"]) - assert_response :success - amf_parse_response - result = amf_result("/1").sort - - assert_equal 0, result.length - end - - def test_getpoi_without_timestamp - node = create(:node, :with_history, :version => 4) - create(:node_tag, :node => node) - - post amf_read_path, amf_content("getpoi", "/1", [node.id, ""]) - assert_response :success - amf_parse_response - result = amf_result("/1") - - assert_equal 7, result.length - assert_equal 0, result[0] - assert_equal "", result[1] - assert_equal node.id, result[2] - assert_equal node.lon, result[3] - assert_equal node.lat, result[4] - assert_equal node.tags, result[5] - assert_equal node.version, result[6] - - post amf_read_path, amf_content("getpoi", "/1", [999999, ""]) - assert_response :success - amf_parse_response - result = amf_result("/1") - - assert_equal 3, result.length - assert_equal(-4, result[0]) - assert_equal "node", result[1] - assert_equal 999999, result[2] - end - - def test_getpoi_with_timestamp - current_node = create(:node, :with_history, :version => 4) - node = current_node.old_nodes.find_by(:version => 2) - - # Timestamps are stored with microseconds, but xmlschema truncates them to - # previous whole second, causing <= comparison to fail - timestamp = (node.timestamp + 1.second).xmlschema - - post amf_read_path, amf_content("getpoi", "/1", [node.node_id, timestamp]) - assert_response :success - amf_parse_response - result = amf_result("/1") - - assert_equal 7, result.length - assert_equal 0, result[0] - assert_equal "", result[1] - assert_equal node.node_id, result[2] - assert_equal node.lon, result[3] - assert_equal node.lat, result[4] - assert_equal node.tags, result[5] - assert_equal current_node.version, result[6] - - post amf_read_path, amf_content("getpoi", "/1", [node.node_id, "2000-01-01T00:00:00Z"]) - assert_response :success - amf_parse_response - result = amf_result("/1") - - assert_equal 3, result.length - assert_equal(-4, result[0]) - assert_equal "node", result[1] - assert_equal node.node_id, result[2] - - post amf_read_path, amf_content("getpoi", "/1", [999999, Time.now.xmlschema]) - assert_response :success - amf_parse_response - result = amf_result("/1") - - assert_equal 3, result.length - assert_equal(-4, result[0]) - assert_equal "node", result[1] - assert_equal 999999, result[2] - end - - # ************************************************************ - # AMF Write tests - - # check that we can update a poi - def test_putpoi_update_valid - nd = create(:node) - cs_id = nd.changeset.id - user = nd.changeset.user - post amf_write_path, amf_content("putpoi", "/1", ["#{user.email}:test", cs_id, nd.version, nd.id, nd.lon, nd.lat, nd.tags, nd.visible]) - assert_response :success - amf_parse_response - result = amf_result("/1") - - assert_equal 5, result.size - assert_equal 0, result[0] - assert_equal "", result[1] - assert_equal nd.id, result[2] - assert_equal nd.id, result[3] - assert_equal nd.version + 1, result[4] - - # Now try to update again, with a different lat/lon, using the updated version number - lat = nd.lat + 0.1 - lon = nd.lon - 0.1 - post amf_write_path, amf_content("putpoi", "/2", ["#{user.email}:test", cs_id, nd.version + 1, nd.id, lon, lat, nd.tags, nd.visible]) - assert_response :success - amf_parse_response - result = amf_result("/2") - - assert_equal 5, result.size - assert_equal 0, result[0] - assert_equal "", result[1] - assert_equal nd.id, result[2] - assert_equal nd.id, result[3] - assert_equal nd.version + 2, result[4] - end - - # Check that we can create a no valid poi - # Using similar method for the node controller test - def test_putpoi_create_valid - # This node has no tags - - # create a node with random lat/lon - lat = rand(-50..49) + rand - lon = rand(-50..49) + rand - - changeset = create(:changeset) - user = changeset.user - - post amf_write_path, amf_content("putpoi", "/1", ["#{user.email}:test", changeset.id, nil, nil, lon, lat, {}, nil]) - assert_response :success - amf_parse_response - result = amf_result("/1") - - # check the array returned by the amf - assert_equal 5, result.size - assert_equal 0, result[0], "expected to get the status ok from the amf" - assert_equal 0, result[2], "The old id should be 0" - assert result[3].positive?, "The new id should be greater than 0" - assert_equal 1, result[4], "The new version should be 1" - - # Finally check that the node that was saved has saved the data correctly - # in both the current and history tables - # First check the current table - current_node = Node.find(result[3].to_i) - assert_in_delta lat, current_node.lat, 0.00001, "The latitude was not retreieved correctly" - assert_in_delta lon, current_node.lon, 0.00001, "The longitude was not retreived correctly" - assert_equal 0, current_node.tags.size, "There seems to be a tag that has been added to the node" - assert_equal result[4], current_node.version, "The version returned, is different to the one returned by the amf" - # Now check the history table - historic_nodes = OldNode.where(:node_id => result[3]) - assert_equal 1, historic_nodes.size, "There should only be one historic node created" - first_historic_node = historic_nodes.first - assert_in_delta lat, first_historic_node.lat, 0.00001, "The latitude was not retreived correctly" - assert_in_delta lon, first_historic_node.lon, 0.00001, "The longitude was not retreuved correctly" - assert_equal 0, first_historic_node.tags.size, "There seems to be a tag that have been attached to this node" - assert_equal result[4], first_historic_node.version, "The version returned, is different to the one returned by the amf" - - #### - # This node has some tags - - # create a node with random lat/lon - lat = rand(-50..49) + rand - lon = rand(-50..49) + rand - - post amf_write_path, amf_content("putpoi", "/2", ["#{user.email}:test", changeset.id, nil, nil, lon, lat, { "key" => "value", "ping" => "pong" }, nil]) - assert_response :success - amf_parse_response - result = amf_result("/2") - - # check the array returned by the amf - assert_equal 5, result.size - assert_equal 0, result[0], "Expected to get the status ok in the amf" - assert_equal 0, result[2], "The old id should be 0" - assert result[3].positive?, "The new id should be greater than 0" - assert_equal 1, result[4], "The new version should be 1" - - # Finally check that the node that was saved has saved the data correctly - # in both the current and history tables - # First check the current table - current_node = Node.find(result[3].to_i) - assert_in_delta lat, current_node.lat, 0.00001, "The latitude was not retreieved correctly" - assert_in_delta lon, current_node.lon, 0.00001, "The longitude was not retreived correctly" - assert_equal 2, current_node.tags.size, "There seems to be a tag that has been added to the node" - assert_equal({ "key" => "value", "ping" => "pong" }, current_node.tags, "tags are different") - assert_equal result[4], current_node.version, "The version returned, is different to the one returned by the amf" - # Now check the history table - historic_nodes = OldNode.where(:node_id => result[3]) - assert_equal 1, historic_nodes.size, "There should only be one historic node created" - first_historic_node = historic_nodes.first - assert_in_delta lat, first_historic_node.lat, 0.00001, "The latitude was not retreived correctly" - assert_in_delta lon, first_historic_node.lon, 0.00001, "The longitude was not retreuved correctly" - assert_equal 2, first_historic_node.tags.size, "There seems to be a tag that have been attached to this node" - assert_equal({ "key" => "value", "ping" => "pong" }, first_historic_node.tags, "tags are different") - assert_equal result[4], first_historic_node.version, "The version returned, is different to the one returned by the amf" - end - - # try creating a POI with rubbish in the tags - def test_putpoi_create_with_control_chars - # This node has no tags - - # create a node with random lat/lon - lat = rand(-50..49) + rand - lon = rand(-50..49) + rand - - changeset = create(:changeset) - user = changeset.user - - mostly_invalid = (0..31).to_a.map(&:chr).join - tags = { "something" => "foo#{mostly_invalid}bar" } - - post amf_write_path, amf_content("putpoi", "/1", ["#{user.email}:test", changeset.id, nil, nil, lon, lat, tags, nil]) - assert_response :success - amf_parse_response - result = amf_result("/1") - - # check the array returned by the amf - assert_equal 5, result.size - assert_equal 0, result[0], "Expected to get the status ok in the amf" - assert_equal 0, result[2], "The old id should be 0" - assert result[3].positive?, "The new id should be greater than 0" - assert_equal 1, result[4], "The new version should be 1" - - # Finally check that the node that was saved has saved the data correctly - # in both the current and history tables - # First check the current table - current_node = Node.find(result[3].to_i) - assert_equal 1, current_node.tags.size, "There seems to be a tag that has been added to the node" - assert_equal({ "something" => "foo\t\n\rbar" }, current_node.tags, "tags were not fixed correctly") - assert_equal result[4], current_node.version, "The version returned, is different to the one returned by the amf" - end - - # try creating a POI with rubbish in the tags - def test_putpoi_create_with_invalid_utf8 - # This node has no tags - - # create a node with random lat/lon - lat = rand(-50..49) + rand - lon = rand(-50..49) + rand - - changeset = create(:changeset) - user = changeset.user - - invalid = "\xc0\xc0" - tags = { "something" => "foo#{invalid}bar" } - - post amf_write_path, amf_content("putpoi", "/1", ["#{user.email}:test", changeset.id, nil, nil, lon, lat, tags, nil]) - assert_response :success - amf_parse_response - result = amf_result("/1") - - assert_equal 2, result.size - assert_equal(-1, result[0], "Expected to get the status FAIL in the amf") - assert_equal "One of the tags is invalid. Linux users may need to upgrade to Flash Player 10.1.", result[1] - end - - # try deleting a node - def test_putpoi_delete_valid - nd = create(:node) - cs_id = nd.changeset.id - user = nd.changeset.user - - post amf_write_path, amf_content("putpoi", "/1", ["#{user.email}:test", cs_id, nd.version, nd.id, nd.lon, nd.lat, nd.tags, false]) - assert_response :success - amf_parse_response - result = amf_result("/1") - - assert_equal 5, result.size - assert_equal 0, result[0] - assert_equal "", result[1] - assert_equal nd.id, result[2] - assert_equal nd.id, result[3] - assert_equal nd.version + 1, result[4] - - current_node = Node.find(result[3].to_i) - assert_not current_node.visible - end - - # try deleting a node that is already deleted - def test_putpoi_delete_already_deleted - nd = create(:node, :deleted) - cs_id = nd.changeset.id - user = nd.changeset.user - - post amf_write_path, amf_content("putpoi", "/1", ["#{user.email}:test", cs_id, nd.version, nd.id, nd.lon, nd.lat, nd.tags, false]) - assert_response :success - amf_parse_response - result = amf_result("/1") - - assert_equal 3, result.size - assert_equal(-4, result[0]) - assert_equal "node", result[1] - assert_equal nd.id, result[2] - end - - # try deleting a node that has never existed - def test_putpoi_delete_not_found - changeset = create(:changeset) - cs_id = changeset.id - user = changeset.user - - post amf_write_path, amf_content("putpoi", "/1", ["#{user.email}:test", cs_id, 1, 999999, 0, 0, {}, false]) - assert_response :success - amf_parse_response - result = amf_result("/1") - - assert_equal 3, result.size - assert_equal(-4, result[0]) - assert_equal "node", result[1] - assert_equal 999999, result[2] - end - - # try setting an invalid location on a node - def test_putpoi_invalid_latlon - nd = create(:node) - cs_id = nd.changeset.id - user = nd.changeset.user - - post amf_write_path, amf_content("putpoi", "/1", ["#{user.email}:test", cs_id, nd.version, nd.id, 200, 100, nd.tags, true]) - assert_response :success - amf_parse_response - result = amf_result("/1") - - assert_equal 2, result.size - assert_equal(-2, result[0]) - assert_match(/Node is not in the world/, result[1]) - end - - # check that we can create a way - def test_putway_create_valid - changeset = create(:changeset) - cs_id = changeset.id - user = changeset.user - - a = create(:node).id - b = create(:node).id - c = create(:node).id - d = create(:node).id - e = create(:node).id - - post amf_write_path, amf_content("putway", "/1", ["#{user.email}:test", cs_id, 0, -1, [a, b, c], { "test" => "new" }, [], {}]) - assert_response :success - amf_parse_response - result = amf_result("/1") - new_way_id = result[3].to_i - - assert_equal 8, result.size - assert_equal 0, result[0] - assert_equal "", result[1] - assert_equal(-1, result[2]) - assert_not_equal(-1, result[3]) - assert_equal({}, result[4]) - assert_equal 1, result[5] - assert_equal({}, result[6]) - assert_equal({}, result[7]) - - new_way = Way.find(new_way_id) - assert_equal 1, new_way.version - assert_equal [a, b, c], new_way.nds - assert_equal({ "test" => "new" }, new_way.tags) - - post amf_write_path, amf_content("putway", "/1", ["#{user.email}:test", cs_id, 0, -1, [b, d, e, a], { "test" => "newer" }, [], {}]) - assert_response :success - amf_parse_response - result = amf_result("/1") - new_way_id = result[3].to_i - - assert_equal 8, result.size - assert_equal 0, result[0] - assert_equal "", result[1] - assert_equal(-1, result[2]) - assert_not_equal(-1, result[3]) - assert_equal({}, result[4]) - assert_equal 1, result[5] - assert_equal({}, result[6]) - assert_equal({}, result[7]) - - new_way = Way.find(new_way_id) - assert_equal 1, new_way.version - assert_equal [b, d, e, a], new_way.nds - assert_equal({ "test" => "newer" }, new_way.tags) - - post amf_write_path, amf_content("putway", "/1", ["#{user.email}:test", cs_id, 0, -1, [b, -1, d, e], { "test" => "newest" }, [[4.56, 12.34, -1, 0, { "test" => "new" }], [12.34, 4.56, d, 1, { "test" => "ok" }]], { a => 1 }]) - assert_response :success - amf_parse_response - result = amf_result("/1") - new_way_id = result[3].to_i - new_node_id = result[4]["-1"].to_i - - assert_equal 8, result.size - assert_equal 0, result[0] - assert_equal "", result[1] - assert_equal(-1, result[2]) - assert_not_equal(-1, result[3]) - assert_equal({ "-1" => new_node_id }, result[4]) - assert_equal 1, result[5] - assert_equal({ new_node_id.to_s => 1, d.to_s => 2 }, result[6]) - assert_equal({ a.to_s => 1 }, result[7]) - - new_way = Way.find(new_way_id) - assert_equal 1, new_way.version - assert_equal [b, new_node_id, d, e], new_way.nds - assert_equal({ "test" => "newest" }, new_way.tags) - - new_node = Node.find(new_node_id) - assert_equal 1, new_node.version - assert new_node.visible - assert_in_delta(4.56, new_node.lon) - assert_in_delta(12.34, new_node.lat) - assert_equal({ "test" => "new" }, new_node.tags) - - changed_node = Node.find(d) - assert_equal 2, changed_node.version - assert changed_node.visible - assert_in_delta(12.34, changed_node.lon) - assert_in_delta(4.56, changed_node.lat) - assert_equal({ "test" => "ok" }, changed_node.tags) - - # node is not deleted because our other ways are using it - deleted_node = Node.find(a) - assert_equal 1, deleted_node.version - assert deleted_node.visible - end - - # check that we can update a way - def test_putway_update_valid - way = create(:way_with_nodes, :nodes_count => 3) - cs_id = way.changeset.id - user = way.changeset.user - - assert_not_equal({ "test" => "ok" }, way.tags) - post amf_write_path, amf_content("putway", "/1", ["#{user.email}:test", cs_id, way.version, way.id, way.nds, { "test" => "ok" }, [], {}]) - assert_response :success - amf_parse_response - result = amf_result("/1") - - assert_equal 8, result.size - assert_equal 0, result[0] - assert_equal "", result[1] - assert_equal way.id, result[2] - assert_equal way.id, result[3] - assert_equal({}, result[4]) - assert_equal way.version + 1, result[5] - assert_equal({}, result[6]) - assert_equal({}, result[7]) - - new_way = Way.find(way.id) - assert_equal way.version + 1, new_way.version - assert_equal way.nds, new_way.nds - assert_equal({ "test" => "ok" }, new_way.tags) - - # Test changing the nodes in the way - a = create(:node).id - b = create(:node).id - c = create(:node).id - d = create(:node).id - - assert_not_equal [a, b, c, d], way.nds - post amf_write_path, amf_content("putway", "/1", ["#{user.email}:test", cs_id, way.version + 1, way.id, [a, b, c, d], way.tags, [], {}]) - assert_response :success - amf_parse_response - result = amf_result("/1") - - assert_equal 8, result.size - assert_equal 0, result[0] - assert_equal "", result[1] - assert_equal way.id, result[2] - assert_equal way.id, result[3] - assert_equal({}, result[4]) - assert_equal way.version + 2, result[5] - assert_equal({}, result[6]) - assert_equal({}, result[7]) - - new_way = Way.find(way.id) - assert_equal way.version + 2, new_way.version - assert_equal [a, b, c, d], new_way.nds - assert_equal way.tags, new_way.tags - - post amf_write_path, amf_content("putway", "/1", ["#{user.email}:test", cs_id, way.version + 2, way.id, [a, -1, b, c], way.tags, [[4.56, 12.34, -1, 0, { "test" => "new" }], [12.34, 4.56, b, 1, { "test" => "ok" }]], { d => 1 }]) - assert_response :success - amf_parse_response - result = amf_result("/1") - new_node_id = result[4]["-1"].to_i - - assert_equal 8, result.size - assert_equal 0, result[0] - assert_equal "", result[1] - assert_equal way.id, result[2] - assert_equal way.id, result[3] - assert_equal({ "-1" => new_node_id }, result[4]) - assert_equal way.version + 3, result[5] - assert_equal({ new_node_id.to_s => 1, b.to_s => 2 }, result[6]) - assert_equal({ d.to_s => 1 }, result[7]) - - new_way = Way.find(way.id) - assert_equal way.version + 3, new_way.version - assert_equal [a, new_node_id, b, c], new_way.nds - assert_equal way.tags, new_way.tags - - new_node = Node.find(new_node_id) - assert_equal 1, new_node.version - assert new_node.visible - assert_in_delta(4.56, new_node.lon) - assert_in_delta(12.34, new_node.lat) - assert_equal({ "test" => "new" }, new_node.tags) - - changed_node = Node.find(b) - assert_equal 2, changed_node.version - assert changed_node.visible - assert_in_delta(12.34, changed_node.lon) - assert_in_delta(4.56, changed_node.lat) - assert_equal({ "test" => "ok" }, changed_node.tags) - - deleted_node = Node.find(d) - assert_equal 2, deleted_node.version - assert_not deleted_node.visible - end - - # check that we can delete a way - def test_deleteway_valid - way = create(:way_with_nodes, :nodes_count => 3) - nodes = way.nodes.each_with_object({}) { |n, ns| ns[n.id] = n.version } - cs_id = way.changeset.id - user = way.changeset.user - - # Of the three nodes, two should be kept since they are used in - # a different way, and the third deleted since it's unused - - a = way.nodes[0] - create(:way_node, :node => a) - b = way.nodes[1] - create(:way_node, :node => b) - c = way.nodes[2] - - post amf_write_path, amf_content("deleteway", "/1", ["#{user.email}:test", cs_id, way.id, way.version, nodes]) - assert_response :success - amf_parse_response - result = amf_result("/1") - - assert_equal 5, result.size - assert_equal 0, result[0] - assert_equal "", result[1] - assert_equal way.id, result[2] - assert_equal way.version + 1, result[3] - assert_equal({ c.id.to_s => 2 }, result[4]) - - new_way = Way.find(way.id) - assert_equal way.version + 1, new_way.version - assert_not new_way.visible - - way.nds.each do |node_id| - assert_equal result[4][node_id.to_s].nil?, Node.find(node_id).visible - end - end - - # check that we can't delete a way that is in use - def test_deleteway_inuse - way = create(:way_with_nodes, :nodes_count => 4) - create(:relation_member, :member => way) - nodes = way.nodes.each_with_object({}) { |n, ns| ns[n.id] = n.version } - cs_id = way.changeset.id - user = way.changeset.user - - post amf_write_path, amf_content("deleteway", "/1", ["#{user.email}:test", cs_id, way.id, way.version, nodes]) - assert_response :success - amf_parse_response - result = amf_result("/1") - - assert_equal 2, result.size - assert_equal(-1, result[0]) - assert_match(/Way #{way.id} is still used/, result[1]) - - new_way = Way.find(way.id) - assert_equal way.version, new_way.version - assert new_way.visible - - way.nds.each do |node_id| - assert Node.find(node_id).visible - end - end - - # check that we can create a relation - def test_putrelation_create_valid - changeset = create(:changeset) - user = changeset.user - cs_id = changeset.id - - node = create(:node) - way = create(:way_with_nodes, :nodes_count => 2) - relation = create(:relation) - - post amf_write_path, amf_content("putrelation", "/1", ["#{user.email}:test", cs_id, 0, -1, { "test" => "new" }, [["Node", node.id, "node"], ["Way", way.id, "way"], ["Relation", relation.id, "relation"]], true]) - assert_response :success - amf_parse_response - result = amf_result("/1") - new_relation_id = result[3].to_i - - assert_equal 5, result.size - assert_equal 0, result[0] - assert_equal "", result[1] - assert_equal(-1, result[2]) - assert_not_equal(-1, result[3]) - assert_equal 1, result[4] - - new_relation = Relation.find(new_relation_id) - assert_equal 1, new_relation.version - assert_equal [["Node", node.id, "node"], ["Way", way.id, "way"], ["Relation", relation.id, "relation"]], new_relation.members - assert_equal({ "test" => "new" }, new_relation.tags) - assert new_relation.visible - end - - # check that we can update a relation - def test_putrelation_update_valid - relation = create(:relation) - create(:relation_member, :relation => relation) - user = relation.changeset.user - cs_id = relation.changeset.id - - assert_not_equal({ "test" => "ok" }, relation.tags) - post amf_write_path, amf_content("putrelation", "/1", ["#{user.email}:test", cs_id, relation.version, relation.id, { "test" => "ok" }, relation.members, true]) - assert_response :success - amf_parse_response - result = amf_result("/1") - - assert_equal 5, result.size - assert_equal 0, result[0] - assert_equal "", result[1] - assert_equal relation.id, result[2] - assert_equal relation.id, result[3] - assert_equal relation.version + 1, result[4] - - new_relation = Relation.find(relation.id) - assert_equal relation.version + 1, new_relation.version - assert_equal relation.members, new_relation.members - assert_equal({ "test" => "ok" }, new_relation.tags) - assert new_relation.visible - end - - # check that we can delete a relation - def test_putrelation_delete_valid - relation = create(:relation) - create(:relation_member, :relation => relation) - create(:relation_tag, :relation => relation) - cs_id = relation.changeset.id - user = relation.changeset.user - - post amf_write_path, amf_content("putrelation", "/1", ["#{user.email}:test", cs_id, relation.version, relation.id, relation.tags, relation.members, false]) - assert_response :success - amf_parse_response - result = amf_result("/1") - - assert_equal 5, result.size - assert_equal 0, result[0] - assert_equal "", result[1] - assert_equal relation.id, result[2] - assert_equal relation.id, result[3] - assert_equal relation.version + 1, result[4] - - new_relation = Relation.find(relation.id) - assert_equal relation.version + 1, new_relation.version - assert_equal [], new_relation.members - assert_equal({}, new_relation.tags) - assert_not new_relation.visible - end - - # check that we can't delete a relation that is in use - def test_putrelation_delete_inuse - relation = create(:relation) - super_relation = create(:relation) - create(:relation_member, :relation => super_relation, :member => relation) - cs_id = relation.changeset.id - user = relation.changeset.user - - post amf_write_path, amf_content("putrelation", "/1", ["#{user.email}:test", cs_id, relation.version, relation.id, relation.tags, relation.members, false]) - assert_response :success - amf_parse_response - result = amf_result("/1") - - assert_equal 2, result.size - assert_equal(-1, result[0]) - assert_match(/relation #{relation.id} is used in/, result[1]) - - new_relation = Relation.find(relation.id) - assert_equal relation.version, new_relation.version - assert_equal relation.members, new_relation.members - assert_equal relation.tags, new_relation.tags - assert new_relation.visible - end - - # check that we can open a changeset - def test_startchangeset_valid - user = create(:user) - - post amf_write_path, amf_content("startchangeset", "/1", ["#{user.email}:test", { "source" => "new" }, nil, "new", 1]) - assert_response :success - amf_parse_response - result = amf_result("/1") - new_cs_id = result[2].to_i - - assert_equal 3, result.size - assert_equal 0, result[0] - assert_equal "", result[1] - - cs = Changeset.find(new_cs_id) - assert cs.is_open? - assert_equal({ "comment" => "new", "source" => "new" }, cs.tags) - - old_cs_id = new_cs_id - - post amf_write_path, amf_content("startchangeset", "/1", ["#{user.email}:test", { "source" => "newer" }, old_cs_id, "newer", 1]) - assert_response :success - amf_parse_response - result = amf_result("/1") - new_cs_id = result[2].to_i - - assert_not_equal old_cs_id, new_cs_id - - assert_equal 3, result.size - assert_equal 0, result[0] - assert_equal "", result[1] - - cs = Changeset.find(old_cs_id) - assert_not cs.is_open? - assert_equal({ "comment" => "newer", "source" => "new" }, cs.tags) - - cs = Changeset.find(new_cs_id) - assert cs.is_open? - assert_equal({ "comment" => "newer", "source" => "newer" }, cs.tags) - - old_cs_id = new_cs_id - - post amf_write_path, amf_content("startchangeset", "/1", ["#{user.email}:test", {}, old_cs_id, "", 0]) - assert_response :success - amf_parse_response - result = amf_result("/1") - - assert_equal 3, result.size - assert_equal 0, result[0] - assert_equal "", result[1] - assert_nil result[2] - - cs = Changeset.find(old_cs_id) - assert_not cs.is_open? - assert_equal({ "comment" => "newer", "source" => "newer" }, cs.tags) - end - - # check that we can't close somebody elses changeset - def test_startchangeset_invalid_wrong_user - user = create(:user) - user2 = create(:user) - - post amf_write_path, amf_content("startchangeset", "/1", ["#{user.email}:test", { "source" => "new" }, nil, "new", 1]) - assert_response :success - amf_parse_response - result = amf_result("/1") - cs_id = result[2].to_i - - assert_equal 3, result.size - assert_equal 0, result[0] - assert_equal "", result[1] - - cs = Changeset.find(cs_id) - assert cs.is_open? - assert_equal({ "comment" => "new", "source" => "new" }, cs.tags) - - post amf_write_path, amf_content("startchangeset", "/1", ["#{user2.email}:test", {}, cs_id, "delete", 0]) - assert_response :success - amf_parse_response - result = amf_result("/1") - - assert_equal 2, result.size - assert_equal(-2, result[0]) - assert_equal "The user doesn't own that changeset", result[1] - - cs = Changeset.find(cs_id) - assert cs.is_open? - assert_equal({ "comment" => "new", "source" => "new" }, cs.tags) - end - - # check that invalid characters are stripped from changeset tags - def test_startchangeset_invalid_xmlchar_comment - user = create(:user) - - invalid = "\035\022" - comment = "foo#{invalid}bar" - - post amf_write_path, amf_content("startchangeset", "/1", ["#{user.email}:test", {}, nil, comment, 1]) - assert_response :success - amf_parse_response - result = amf_result("/1") - new_cs_id = result[2].to_i - - assert_equal 3, result.size - assert_equal 0, result[0] - assert_equal "", result[1] - - cs = Changeset.find(new_cs_id) - assert cs.is_open? - assert_equal({ "comment" => "foobar" }, cs.tags) - end - - private - - # ************************************************************ - # AMF Helper functions - - # Get the result record for the specified ID - # It's an assertion FAIL if the record does not exist - def amf_result(ref) - assert @amf_result.key?("#{ref}/onResult") - @amf_result["#{ref}/onResult"] - end - - # Encode the AMF message to invoke "target" with parameters as - # the passed data. The ref is used to retrieve the results. - def amf_content(target, ref, data) - a, b = 1.divmod(256) - c = StringIO.new - c.write 0.chr * 2 # version 0 - c.write 0.chr * 2 # n headers - c.write a.chr + b.chr # n bodies - c.write AMF.encodestring(target) - c.write AMF.encodestring(ref) - c.write [-1].pack("N") - c.write AMF.encodevalue(data) - - { :params => c.string, :headers => { "Content-Type" => "application/x-amf" } } - end - - # Parses the @response object as an AMF messsage. - # The result is a hash of message_ref => data. - # The attribute @amf_result is initialised to this hash. - def amf_parse_response - req = StringIO.new(@response.body) - - req.read(2) # version - - # parse through any headers - headers = AMF.getint(req) # Read number of headers - headers.times do # Read each header - AMF.getstring(req) # | - req.getc # | skip boolean - AMF.getvalue(req) # | - end - - # parse through responses - results = {} - bodies = AMF.getint(req) # Read number of bodies - bodies.times do # Read each body - message = AMF.getstring(req) # | get message name - AMF.getstring(req) # | get index in response sequence - AMF.getlong(req) # | get total size in bytes - args = AMF.getvalue(req) # | get response (probably an array) - results[message] = args - end - @amf_result = results - results - end - - ## - # given an array of bounding boxes (each an array of 4 floats), call the - # AMF "whichways" controller for each and pass the result back to the - # caller's block for assertion testing. - def check_bboxes_are_bad(bboxes) - bboxes.each do |bbox| - post amf_read_path, amf_content("whichways", "/1", bbox) - assert_response :success - amf_parse_response - - # pass the response back to the caller's block to be tested - # against what the caller expected. - map = amf_result "/1" - yield map, bbox - end - end - - # this should be what AMF controller returns when the bbox of a - # whichways request is invalid or too large. - def assert_boundary_error(map, msg = nil, error_hint = nil) - expected_map = [-2, "Sorry - I can't get the map for that area.#{msg}"] - assert_equal expected_map, map, "AMF controller should have returned an error. (#{error_hint})" - end - - # this should be what AMF controller returns when the bbox of a - # whichways_deleted request is invalid or too large. - def assert_deleted_boundary_error(map, msg = nil, error_hint = nil) - expected_map = [-2, "Sorry - I can't get the map for that area.#{msg}"] - assert_equal expected_map, map, "AMF controller should have returned an error. (#{error_hint})" - end - end -end diff --git a/test/controllers/api/tracepoints_controller_test.rb b/test/controllers/api/tracepoints_controller_test.rb index 5b4f4ad84..d3fb195fe 100644 --- a/test/controllers/api/tracepoints_controller_test.rb +++ b/test/controllers/api/tracepoints_controller_test.rb @@ -38,7 +38,10 @@ module Api assert_response :success assert_select "gpx[version='1.0'][creator='OpenStreetMap.org']", :count => 1 do assert_select "trk" do - assert_select "trkseg" + assert_select "name", :count => 0 + assert_select "desc", :count => 0 + assert_select "url", :count => 0 + assert_select "trkseg", :count => 1 end end end @@ -57,7 +60,10 @@ module Api assert_response :success assert_select "gpx[version='1.0'][creator='OpenStreetMap.org']", :count => 1 do assert_select "trk", :count => 1 do - assert_select "trk > trkseg", :count => 2 do |trksegs| + assert_select "name", :count => 0 + assert_select "desc", :count => 0 + assert_select "url", :count => 0 + assert_select "trkseg", :count => 2 do |trksegs| trksegs.each do |trkseg| assert_select trkseg, "trkpt", :count => 1 do |trkpt| assert_select trkpt[0], "time", :count => 1 @@ -81,9 +87,9 @@ module Api assert_response :success assert_select "gpx[version='1.0'][creator='OpenStreetMap.org']", :count => 1 do assert_select "trk", :count => 1 do - assert_select "trk>name", :count => 1 - assert_select "trk>desc", :count => 1 - assert_select "trk>url", :count => 1 + assert_select "name", :count => 1 + assert_select "desc", :count => 1 + assert_select "url", :count => 1 assert_select "trkseg", :count => 1 do assert_select "trkpt", :count => 1 do assert_select "time", :count => 1 @@ -99,7 +105,7 @@ module Api assert_equal "The parameter bbox is required, and must be of the form min_lon,min_lat,max_lon,max_lat", @response.body, "A bbox param was expected" end - def test_traces_page_less_than_0 + def test_traces_page_less_than_zero -10.upto(-1) do |i| get trackpoints_path(:page => i, :bbox => "-0.1,-0.1,0.1,0.1") assert_response :bad_request diff --git a/test/controllers/geocoder_controller_test.rb b/test/controllers/geocoder_controller_test.rb index a7541c075..d0f0ce086 100644 --- a/test/controllers/geocoder_controller_test.rb +++ b/test/controllers/geocoder_controller_test.rb @@ -479,7 +479,7 @@ class GeocoderControllerTest < ActionDispatch::IntegrationTest assert_select "li.search_results_entry", results.count results.each do |result| - attrs = result.collect { |k, v| "[data-#{k}='#{v}']" }.join("") + attrs = result.collect { |k, v| "[data-#{k}='#{v}']" }.join assert_select "li.search_results_entry a.set_position#{attrs}", result[:name] end end diff --git a/test/controllers/site_controller_test.rb b/test/controllers/site_controller_test.rb index b7571b1f5..4d08a8d0c 100644 --- a/test/controllers/site_controller_test.rb +++ b/test/controllers/site_controller_test.rb @@ -7,14 +7,12 @@ class SiteControllerTest < ActionDispatch::IntegrationTest super Settings.id_key = create(:client_application).key - Settings.potlatch2_key = create(:client_application).key end ## # clear oauth keys def teardown Settings.id_key = nil - Settings.potlatch2_key = nil end ## diff --git a/test/controllers/traces_controller_test.rb b/test/controllers/traces_controller_test.rb index 364142dd9..36bee9c95 100644 --- a/test/controllers/traces_controller_test.rb +++ b/test/controllers/traces_controller_test.rb @@ -761,7 +761,9 @@ class TracesControllerTest < ActionDispatch::IntegrationTest assert_response :success assert_template "index" - if !traces.empty? + if traces.empty? + assert_select "h4", /Nothing here yet/ + else assert_select "table#trace_list tbody", :count => 1 do assert_select "tr", :count => traces.length do |rows| traces.zip(rows).each do |trace, row| @@ -772,8 +774,6 @@ class TracesControllerTest < ActionDispatch::IntegrationTest end end end - else - assert_select "h4", /Nothing here yet/ end end diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index bffcfe5bd..89c2d2c9c 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -969,13 +969,13 @@ class UsersControllerTest < ActionDispatch::IntegrationTest assert_select "form#accountForm > fieldset > div.standard-form-row > select#user_preferred_editor > option[selected]", false # Changing to a valid editor should work - user.preferred_editor = "potlatch2" + user.preferred_editor = "id" post user_account_path(user), :params => { :user => user.attributes } assert_response :success assert_template :account assert_select "div#errorExplanation", false assert_select ".notice", /^User information updated successfully/ - assert_select "form#accountForm > fieldset > div.standard-form-row > select#user_preferred_editor > option[selected][value=?]", "potlatch2" + assert_select "form#accountForm > fieldset > div.standard-form-row > select#user_preferred_editor > option[selected][value=?]", "id" # Changing to the default editor should work user.preferred_editor = "default" diff --git a/test/factories/diary_entry_subscriptions.rb b/test/factories/diary_entry_subscriptions.rb index ced345479..b5fc8405d 100644 --- a/test/factories/diary_entry_subscriptions.rb +++ b/test/factories/diary_entry_subscriptions.rb @@ -1,4 +1,3 @@ FactoryBot.define do - factory :diary_entry_subscription do - end + factory :diary_entry_subscription end diff --git a/test/helpers/user_helper_test.rb b/test/helpers/user_helper_test.rb index c2b54c056..340d2494d 100644 --- a/test/helpers/user_helper_test.rb +++ b/test/helpers/user_helper_test.rb @@ -73,10 +73,10 @@ class UserHelperTest < ActionView::TestCase def test_auth_button button = auth_button("google", "google") - assert_equal("\"Login", button) + assert_equal("\"Login", button) button = auth_button("yahoo", "openid", :openid_url => "yahoo.com") - assert_equal("\"Login", button) + assert_equal("\"Login", button) end private diff --git a/test/lib/osm_test.rb b/test/lib/osm_test.rb new file mode 100644 index 000000000..032ece55a --- /dev/null +++ b/test/lib/osm_test.rb @@ -0,0 +1,15 @@ +require "test_helper" + +class OsmTest < ActiveSupport::TestCase + def test_mercator + proj = OSM::Mercator.new(0, 0, 1, 1, 100, 200) + assert_in_delta(50, proj.x(0.5), 0.01) + assert_in_delta(100, proj.y(0.5), 0.01) + end + + def test_mercator_collapsed_bbox + proj = OSM::Mercator.new(0, 0, 0, 0, 100, 200) + assert_in_delta(50, proj.x(0), 0.01) + assert_in_delta(100, proj.y(0), 0.01) + end +end diff --git a/test/models/old_way_test.rb b/test/models/old_way_test.rb index c8f4a4480..d28723c5b 100644 --- a/test/models/old_way_test.rb +++ b/test/models/old_way_test.rb @@ -101,38 +101,4 @@ class OldWayTest < ActiveSupport::TestCase assert_equal tag.v, tags[tag.k] end end - - def test_get_nodes_undelete - way = create(:way, :with_history, :version => 4) - way_v3 = way.old_ways.find_by(:version => 3) - way_v4 = way.old_ways.find_by(:version => 4) - node_a = create(:node, :with_history, :version => 4) - node_b = create(:node, :with_history, :version => 3) - node_c = create(:node, :with_history, :version => 2) - node_d = create(:node, :with_history, :deleted, :version => 1) - create(:old_way_node, :old_way => way_v3, :node => node_a, :sequence_id => 1) - create(:old_way_node, :old_way => way_v3, :node => node_b, :sequence_id => 2) - create(:old_way_node, :old_way => way_v4, :node => node_c, :sequence_id => 1) - node_tag = create(:node_tag, :node => node_a) - node_tag2 = create(:node_tag, :node => node_b) - node_tag3 = create(:node_tag, :node => node_d) - - nodes = OldWay.find(way_v3.id).get_nodes_undelete - assert_equal 2, nodes.size - assert_equal [node_a.lon, node_a.lat, node_a.id, node_a.version, { node_tag.k => node_tag.v }, true], nodes[0] - assert_equal [node_b.lon, node_b.lat, node_b.id, node_b.version, { node_tag2.k => node_tag2.v }, true], nodes[1] - - redacted_way = create(:way, :with_history, :version => 3) - redacted_way_v2 = redacted_way.old_ways.find_by(:version => 2) - redacted_way_v3 = redacted_way.old_ways.find_by(:version => 3) - create(:old_way_node, :old_way => redacted_way_v2, :node => node_b, :sequence_id => 1) - create(:old_way_node, :old_way => redacted_way_v2, :node => node_d, :sequence_id => 2) - create(:old_way_node, :old_way => redacted_way_v3, :node => node_c, :sequence_id => 1) - redacted_way_v2.redact!(create(:redaction)) - - nodes = OldWay.find(redacted_way_v2.id).get_nodes_undelete - assert_equal 2, nodes.size - assert_equal [node_b.lon, node_b.lat, node_b.id, node_b.version, { node_tag2.k => node_tag2.v }, true], nodes[0] - assert_equal [node_d.lon, node_d.lat, node_d.id, node_d.version, { node_tag3.k => node_tag3.v }, false], nodes[1] - end end diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 330f40df2..de318df20 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -151,8 +151,8 @@ class UserTest < ActiveSupport::TestCase def test_user_preferred_editor user = create(:user) assert_nil user.preferred_editor - user.preferred_editor = "potlatch" - assert_equal "potlatch", user.preferred_editor + user.preferred_editor = "id" + assert_equal "id", user.preferred_editor user.save! user.preferred_editor = "invalid_editor" @@ -268,24 +268,4 @@ class UserTest < ActiveSupport::TestCase assert_not user.visible? assert_not user.active? end - - def test_to_xml - user = build(:user, :with_home_location) - xml = user.to_xml - assert_select Nokogiri::XML::Document.parse(xml.to_s), "user" do - assert_select "[display_name=?]", user.display_name - assert_select "[account_created=?]", user.creation_time.xmlschema - assert_select "home[lat=?][lon=?][zoom=?]", user.home_lat.to_s, user.home_lon.to_s, user.home_zoom.to_s - end - end - - def test_to_xml_node - user = build(:user, :with_home_location) - xml = user.to_xml_node - assert_select Nokogiri::XML::DocumentFragment.parse(xml.to_s), "user" do - assert_select "[display_name=?]", user.display_name - assert_select "[account_created=?]", user.creation_time.xmlschema - assert_select "home[lat=?][lon=?][zoom=?]", user.home_lat.to_s, user.home_lon.to_s, user.home_zoom.to_s - end - end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 720618ba0..a023dd610 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,21 +1,30 @@ -require "coveralls" -Coveralls.wear!("rails") - -# Override the simplecov output message, since it is mostly unwanted noise -module SimpleCov - module Formatter - class HTMLFormatter - def output_message(_result); end +require "simplecov" +require "simplecov-lcov" + +# Fix incompatibility of simplecov-lcov with older versions of simplecov that are not expresses in its gemspec. +# https://github.com/fortissimo1997/simplecov-lcov/pull/25 +unless SimpleCov.respond_to?(:branch_coverage) + module SimpleCov + def self.branch_coverage? + false end end end -# Output both the local simplecov html and the coveralls report -SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new( - [SimpleCov::Formatter::HTMLFormatter, - Coveralls::SimpleCov::Formatter] +SimpleCov::Formatter::LcovFormatter.config do |config| + config.report_with_single_file = true + config.single_report_path = "coverage/lcov.info" +end + +SimpleCov.formatters = SimpleCov::Formatter::MultiFormatter.new( + [ + SimpleCov::Formatter::HTMLFormatter, + SimpleCov::Formatter::LcovFormatter + ] ) +SimpleCov.start("rails") + require "securerandom" require "digest/sha1" @@ -34,6 +43,14 @@ module ActiveSupport # Run tests in parallel with specified workers parallelize(:workers => :number_of_processors) + parallelize_setup do |worker| + SimpleCov.command_name "#{SimpleCov.command_name}-#{worker}" + end + + parallelize_teardown do + SimpleCov.result + end + ## # takes a block which is executed in the context of a different # ActionController instance. this is used so that code can call methods diff --git a/vendor/assets/potlatch2/help/introduction.jpg b/vendor/assets/potlatch2/help/introduction.jpg deleted file mode 100644 index c24ce535d..000000000 Binary files a/vendor/assets/potlatch2/help/introduction.jpg and /dev/null differ diff --git a/vendor/assets/potlatch2/help/introduction.mp4 b/vendor/assets/potlatch2/help/introduction.mp4 deleted file mode 100644 index 98007921c..000000000 Binary files a/vendor/assets/potlatch2/help/introduction.mp4 and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2.swf b/vendor/assets/potlatch2/potlatch2.swf deleted file mode 100644 index f518ea8df..000000000 Binary files a/vendor/assets/potlatch2/potlatch2.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/FontLibrary.swf b/vendor/assets/potlatch2/potlatch2/FontLibrary.swf deleted file mode 100644 index 104c8c950..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/FontLibrary.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/assets.zip b/vendor/assets/potlatch2/potlatch2/assets.zip deleted file mode 100644 index ac4983d7b..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/assets.zip and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/af.swf b/vendor/assets/potlatch2/potlatch2/locales/af.swf deleted file mode 100644 index 58bd8ab5d..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/af.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/ar.swf b/vendor/assets/potlatch2/potlatch2/locales/ar.swf deleted file mode 100644 index 300f429ae..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/ar.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/arc.swf b/vendor/assets/potlatch2/potlatch2/locales/arc.swf deleted file mode 100644 index 36d42b835..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/arc.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/ast.swf b/vendor/assets/potlatch2/potlatch2/locales/ast.swf deleted file mode 100644 index f167ec4a4..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/ast.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/az.swf b/vendor/assets/potlatch2/potlatch2/locales/az.swf deleted file mode 100644 index 49ea1aba8..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/az.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/ba.swf b/vendor/assets/potlatch2/potlatch2/locales/ba.swf deleted file mode 100644 index b708cccae..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/ba.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/be-tarask.swf b/vendor/assets/potlatch2/potlatch2/locales/be-tarask.swf deleted file mode 100644 index 6ca5e3152..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/be-tarask.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/be.swf b/vendor/assets/potlatch2/potlatch2/locales/be.swf deleted file mode 100644 index 33ea44673..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/be.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/bg.swf b/vendor/assets/potlatch2/potlatch2/locales/bg.swf deleted file mode 100644 index a147e0e7c..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/bg.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/bn.swf b/vendor/assets/potlatch2/potlatch2/locales/bn.swf deleted file mode 100644 index 452c0c3f5..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/bn.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/br.swf b/vendor/assets/potlatch2/potlatch2/locales/br.swf deleted file mode 100644 index 2e51d91fc..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/br.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/bs.swf b/vendor/assets/potlatch2/potlatch2/locales/bs.swf deleted file mode 100644 index ee31f1468..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/bs.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/ca.swf b/vendor/assets/potlatch2/potlatch2/locales/ca.swf deleted file mode 100644 index 3d10696a0..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/ca.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/ce.swf b/vendor/assets/potlatch2/potlatch2/locales/ce.swf deleted file mode 100644 index c6f9f6304..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/ce.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/cs_CZ.swf b/vendor/assets/potlatch2/potlatch2/locales/cs_CZ.swf deleted file mode 100644 index e821b85a7..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/cs_CZ.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/cy.swf b/vendor/assets/potlatch2/potlatch2/locales/cy.swf deleted file mode 100644 index a3a05f5a6..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/cy.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/da.swf b/vendor/assets/potlatch2/potlatch2/locales/da.swf deleted file mode 100644 index 97ddb9ffc..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/da.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/de-formal.swf b/vendor/assets/potlatch2/potlatch2/locales/de-formal.swf deleted file mode 100644 index fd203b3fa..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/de-formal.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/de_DE.swf b/vendor/assets/potlatch2/potlatch2/locales/de_DE.swf deleted file mode 100644 index 7a23936c2..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/de_DE.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/diq.swf b/vendor/assets/potlatch2/potlatch2/locales/diq.swf deleted file mode 100644 index 3200c241f..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/diq.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/dsb.swf b/vendor/assets/potlatch2/potlatch2/locales/dsb.swf deleted file mode 100644 index 83a853623..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/dsb.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/el.swf b/vendor/assets/potlatch2/potlatch2/locales/el.swf deleted file mode 100644 index 79902e5c4..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/el.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/en_GB.swf b/vendor/assets/potlatch2/potlatch2/locales/en_GB.swf deleted file mode 100644 index 577af4a88..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/en_GB.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/en_US.swf b/vendor/assets/potlatch2/potlatch2/locales/en_US.swf deleted file mode 100644 index 86b6f28be..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/en_US.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/eo.swf b/vendor/assets/potlatch2/potlatch2/locales/eo.swf deleted file mode 100644 index c3675fc69..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/eo.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/es_ES.swf b/vendor/assets/potlatch2/potlatch2/locales/es_ES.swf deleted file mode 100644 index b50a2adb5..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/es_ES.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/et.swf b/vendor/assets/potlatch2/potlatch2/locales/et.swf deleted file mode 100644 index e65dd758b..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/et.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/eu.swf b/vendor/assets/potlatch2/potlatch2/locales/eu.swf deleted file mode 100644 index 9806584a0..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/eu.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/fa.swf b/vendor/assets/potlatch2/potlatch2/locales/fa.swf deleted file mode 100644 index 36f92c969..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/fa.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/fi.swf b/vendor/assets/potlatch2/potlatch2/locales/fi.swf deleted file mode 100644 index f5ea48660..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/fi.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/fo.swf b/vendor/assets/potlatch2/potlatch2/locales/fo.swf deleted file mode 100644 index 67a149542..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/fo.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/fr_FR.swf b/vendor/assets/potlatch2/potlatch2/locales/fr_FR.swf deleted file mode 100644 index ee73d8b2d..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/fr_FR.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/fur.swf b/vendor/assets/potlatch2/potlatch2/locales/fur.swf deleted file mode 100644 index 5a5ac5101..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/fur.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/fy.swf b/vendor/assets/potlatch2/potlatch2/locales/fy.swf deleted file mode 100644 index 89e003802..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/fy.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/ga.swf b/vendor/assets/potlatch2/potlatch2/locales/ga.swf deleted file mode 100644 index bbea73d7c..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/ga.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/gd.swf b/vendor/assets/potlatch2/potlatch2/locales/gd.swf deleted file mode 100644 index f5f873130..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/gd.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/gl.swf b/vendor/assets/potlatch2/potlatch2/locales/gl.swf deleted file mode 100644 index 22494e4b8..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/gl.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/grc.swf b/vendor/assets/potlatch2/potlatch2/locales/grc.swf deleted file mode 100644 index 455dd550b..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/grc.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/he.swf b/vendor/assets/potlatch2/potlatch2/locales/he.swf deleted file mode 100644 index 41f50ef13..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/he.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/hr.swf b/vendor/assets/potlatch2/potlatch2/locales/hr.swf deleted file mode 100644 index 55d33456e..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/hr.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/hsb.swf b/vendor/assets/potlatch2/potlatch2/locales/hsb.swf deleted file mode 100644 index cb1c5270c..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/hsb.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/hu.swf b/vendor/assets/potlatch2/potlatch2/locales/hu.swf deleted file mode 100644 index bd4551a05..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/hu.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/ia.swf b/vendor/assets/potlatch2/potlatch2/locales/ia.swf deleted file mode 100644 index 7500b7ea2..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/ia.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/id.swf b/vendor/assets/potlatch2/potlatch2/locales/id.swf deleted file mode 100644 index e2d121bf3..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/id.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/is.swf b/vendor/assets/potlatch2/potlatch2/locales/is.swf deleted file mode 100644 index f32b92571..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/is.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/it_IT.swf b/vendor/assets/potlatch2/potlatch2/locales/it_IT.swf deleted file mode 100644 index 429f6fd77..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/it_IT.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/ja_JP.swf b/vendor/assets/potlatch2/potlatch2/locales/ja_JP.swf deleted file mode 100644 index 96ce49b71..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/ja_JP.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/ka.swf b/vendor/assets/potlatch2/potlatch2/locales/ka.swf deleted file mode 100644 index f59002a20..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/ka.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/kab.swf b/vendor/assets/potlatch2/potlatch2/locales/kab.swf deleted file mode 100644 index 32244ea5b..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/kab.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/km.swf b/vendor/assets/potlatch2/potlatch2/locales/km.swf deleted file mode 100644 index 4c5c8248e..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/km.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/kn.swf b/vendor/assets/potlatch2/potlatch2/locales/kn.swf deleted file mode 100644 index ba3076ee5..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/kn.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/ko.swf b/vendor/assets/potlatch2/potlatch2/locales/ko.swf deleted file mode 100644 index 019e21f9a..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/ko.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/krc.swf b/vendor/assets/potlatch2/potlatch2/locales/krc.swf deleted file mode 100644 index c7966c1e9..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/krc.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/ksh.swf b/vendor/assets/potlatch2/potlatch2/locales/ksh.swf deleted file mode 100644 index 4ebcf5743..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/ksh.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/ku-latn.swf b/vendor/assets/potlatch2/potlatch2/locales/ku-latn.swf deleted file mode 100644 index eeeeb12f4..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/ku-latn.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/ky.swf b/vendor/assets/potlatch2/potlatch2/locales/ky.swf deleted file mode 100644 index a54a23f74..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/ky.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/lb.swf b/vendor/assets/potlatch2/potlatch2/locales/lb.swf deleted file mode 100644 index 899844788..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/lb.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/lez.swf b/vendor/assets/potlatch2/potlatch2/locales/lez.swf deleted file mode 100644 index bf78c2ec9..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/lez.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/lt.swf b/vendor/assets/potlatch2/potlatch2/locales/lt.swf deleted file mode 100644 index 91cb26ec4..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/lt.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/lv.swf b/vendor/assets/potlatch2/potlatch2/locales/lv.swf deleted file mode 100644 index e6eb43418..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/lv.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/lzz.swf b/vendor/assets/potlatch2/potlatch2/locales/lzz.swf deleted file mode 100644 index d01562775..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/lzz.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/mg.swf b/vendor/assets/potlatch2/potlatch2/locales/mg.swf deleted file mode 100644 index 243138d82..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/mg.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/mk.swf b/vendor/assets/potlatch2/potlatch2/locales/mk.swf deleted file mode 100644 index 1f8b9c94f..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/mk.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/mr.swf b/vendor/assets/potlatch2/potlatch2/locales/mr.swf deleted file mode 100644 index 8df83f3c3..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/mr.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/ms.swf b/vendor/assets/potlatch2/potlatch2/locales/ms.swf deleted file mode 100644 index 760d095db..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/ms.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/my.swf b/vendor/assets/potlatch2/potlatch2/locales/my.swf deleted file mode 100644 index 27f7266a0..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/my.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/nb_NO.swf b/vendor/assets/potlatch2/potlatch2/locales/nb_NO.swf deleted file mode 100644 index 9a1d43305..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/nb_NO.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/ne.swf b/vendor/assets/potlatch2/potlatch2/locales/ne.swf deleted file mode 100644 index f54d59b44..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/ne.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/nl_NL.swf b/vendor/assets/potlatch2/potlatch2/locales/nl_NL.swf deleted file mode 100644 index 394648013..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/nl_NL.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/nn_NO.swf b/vendor/assets/potlatch2/potlatch2/locales/nn_NO.swf deleted file mode 100644 index 366a24678..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/nn_NO.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/oc.swf b/vendor/assets/potlatch2/potlatch2/locales/oc.swf deleted file mode 100644 index 7b5255b9e..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/oc.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/pa.swf b/vendor/assets/potlatch2/potlatch2/locales/pa.swf deleted file mode 100644 index 190604b33..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/pa.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/pl_PL.swf b/vendor/assets/potlatch2/potlatch2/locales/pl_PL.swf deleted file mode 100644 index b3e121caa..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/pl_PL.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/ps.swf b/vendor/assets/potlatch2/potlatch2/locales/ps.swf deleted file mode 100644 index 147546258..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/ps.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/pt_BR.swf b/vendor/assets/potlatch2/potlatch2/locales/pt_BR.swf deleted file mode 100644 index 481e1d762..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/pt_BR.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/pt_PT.swf b/vendor/assets/potlatch2/potlatch2/locales/pt_PT.swf deleted file mode 100644 index dc1b228fd..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/pt_PT.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/ro.swf b/vendor/assets/potlatch2/potlatch2/locales/ro.swf deleted file mode 100644 index a3c90391e..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/ro.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/ru.swf b/vendor/assets/potlatch2/potlatch2/locales/ru.swf deleted file mode 100644 index 1c84e017d..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/ru.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/rue.swf b/vendor/assets/potlatch2/potlatch2/locales/rue.swf deleted file mode 100644 index 26b3b11ae..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/rue.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/sah.swf b/vendor/assets/potlatch2/potlatch2/locales/sah.swf deleted file mode 100644 index 18ba7953f..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/sah.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/scn.swf b/vendor/assets/potlatch2/potlatch2/locales/scn.swf deleted file mode 100644 index f37f00e76..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/scn.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/shn.swf b/vendor/assets/potlatch2/potlatch2/locales/shn.swf deleted file mode 100644 index b06b3aac1..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/shn.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/sk.swf b/vendor/assets/potlatch2/potlatch2/locales/sk.swf deleted file mode 100644 index 9dbb7b5c3..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/sk.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/skr-arab.swf b/vendor/assets/potlatch2/potlatch2/locales/skr-arab.swf deleted file mode 100644 index 66a64341b..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/skr-arab.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/sl.swf b/vendor/assets/potlatch2/potlatch2/locales/sl.swf deleted file mode 100644 index 5e14cd93d..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/sl.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/sq.swf b/vendor/assets/potlatch2/potlatch2/locales/sq.swf deleted file mode 100644 index 381a6b0f2..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/sq.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/sr-ec.swf b/vendor/assets/potlatch2/potlatch2/locales/sr-ec.swf deleted file mode 100644 index ac984efb3..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/sr-ec.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/sr-el.swf b/vendor/assets/potlatch2/potlatch2/locales/sr-el.swf deleted file mode 100644 index 6645dc112..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/sr-el.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/sty.swf b/vendor/assets/potlatch2/potlatch2/locales/sty.swf deleted file mode 100644 index e7414bcbe..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/sty.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/sv_SE.swf b/vendor/assets/potlatch2/potlatch2/locales/sv_SE.swf deleted file mode 100644 index 6f59472eb..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/sv_SE.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/ta.swf b/vendor/assets/potlatch2/potlatch2/locales/ta.swf deleted file mode 100644 index d211e831b..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/ta.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/te.swf b/vendor/assets/potlatch2/potlatch2/locales/te.swf deleted file mode 100644 index e45aab2de..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/te.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/th.swf b/vendor/assets/potlatch2/potlatch2/locales/th.swf deleted file mode 100644 index 6c644e749..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/th.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/tl.swf b/vendor/assets/potlatch2/potlatch2/locales/tl.swf deleted file mode 100644 index 0597c8783..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/tl.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/tly.swf b/vendor/assets/potlatch2/potlatch2/locales/tly.swf deleted file mode 100644 index cbc29e38f..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/tly.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/tr.swf b/vendor/assets/potlatch2/potlatch2/locales/tr.swf deleted file mode 100644 index 8f82aa3b8..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/tr.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/tyv.swf b/vendor/assets/potlatch2/potlatch2/locales/tyv.swf deleted file mode 100644 index 87ba6464b..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/tyv.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/tzm.swf b/vendor/assets/potlatch2/potlatch2/locales/tzm.swf deleted file mode 100644 index b0681b6a3..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/tzm.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/uk.swf b/vendor/assets/potlatch2/potlatch2/locales/uk.swf deleted file mode 100644 index e5b88f365..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/uk.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/vi_VN.swf b/vendor/assets/potlatch2/potlatch2/locales/vi_VN.swf deleted file mode 100644 index ef308f093..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/vi_VN.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/vo.swf b/vendor/assets/potlatch2/potlatch2/locales/vo.swf deleted file mode 100644 index de3a2d599..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/vo.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/yi.swf b/vendor/assets/potlatch2/potlatch2/locales/yi.swf deleted file mode 100644 index ea316ba89..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/yi.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/zh_CN.swf b/vendor/assets/potlatch2/potlatch2/locales/zh_CN.swf deleted file mode 100644 index 149f27415..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/zh_CN.swf and /dev/null differ diff --git a/vendor/assets/potlatch2/potlatch2/locales/zh_TW.swf b/vendor/assets/potlatch2/potlatch2/locales/zh_TW.swf deleted file mode 100644 index 240f64d11..000000000 Binary files a/vendor/assets/potlatch2/potlatch2/locales/zh_TW.swf and /dev/null differ diff --git a/vendor/assets/swfobject/expressInstall.swf b/vendor/assets/swfobject/expressInstall.swf deleted file mode 100755 index 0fbf8fca9..000000000 Binary files a/vendor/assets/swfobject/expressInstall.swf and /dev/null differ diff --git a/vendor/assets/swfobject/swfobject.js b/vendor/assets/swfobject/swfobject.js deleted file mode 100755 index 9378c8f75..000000000 --- a/vendor/assets/swfobject/swfobject.js +++ /dev/null @@ -1,777 +0,0 @@ -/*! SWFObject v2.2 - is released under the MIT License -*/ - -var swfobject = function() { - - var UNDEF = "undefined", - OBJECT = "object", - SHOCKWAVE_FLASH = "Shockwave Flash", - SHOCKWAVE_FLASH_AX = "ShockwaveFlash.ShockwaveFlash", - FLASH_MIME_TYPE = "application/x-shockwave-flash", - EXPRESS_INSTALL_ID = "SWFObjectExprInst", - ON_READY_STATE_CHANGE = "onreadystatechange", - - win = window, - doc = document, - nav = navigator, - - plugin = false, - domLoadFnArr = [main], - regObjArr = [], - objIdArr = [], - listenersArr = [], - storedAltContent, - storedAltContentId, - storedCallbackFn, - storedCallbackObj, - isDomLoaded = false, - isExpressInstallActive = false, - dynamicStylesheet, - dynamicStylesheetMedia, - autoHideShow = true, - - /* Centralized function for browser feature detection - - User agent string detection is only used when no good alternative is possible - - Is executed directly for optimal performance - */ - ua = function() { - var w3cdom = typeof doc.getElementById != UNDEF && typeof doc.getElementsByTagName != UNDEF && typeof doc.createElement != UNDEF, - u = nav.userAgent.toLowerCase(), - p = nav.platform.toLowerCase(), - windows = p ? /win/.test(p) : /win/.test(u), - mac = p ? /mac/.test(p) : /mac/.test(u), - webkit = /webkit/.test(u) ? parseFloat(u.replace(/^.*webkit\/(\d+(\.\d+)?).*$/, "$1")) : false, // returns either the webkit version or false if not webkit - ie = !+"\v1", // feature detection based on Andrea Giammarchi's solution: http://webreflection.blogspot.com/2009/01/32-bytes-to-know-if-your-browser-is-ie.html - playerVersion = [0,0,0], - d = null; - if (typeof nav.plugins != UNDEF && typeof nav.plugins[SHOCKWAVE_FLASH] == OBJECT) { - d = nav.plugins[SHOCKWAVE_FLASH].description; - if (d && !(typeof nav.mimeTypes != UNDEF && nav.mimeTypes[FLASH_MIME_TYPE] && !nav.mimeTypes[FLASH_MIME_TYPE].enabledPlugin)) { // navigator.mimeTypes["application/x-shockwave-flash"].enabledPlugin indicates whether plug-ins are enabled or disabled in Safari 3+ - plugin = true; - ie = false; // cascaded feature detection for Internet Explorer - d = d.replace(/^.*\s+(\S+\s+\S+$)/, "$1"); - playerVersion[0] = parseInt(d.replace(/^(.*)\..*$/, "$1"), 10); - playerVersion[1] = parseInt(d.replace(/^.*\.(.*)\s.*$/, "$1"), 10); - playerVersion[2] = /[a-zA-Z]/.test(d) ? parseInt(d.replace(/^.*[a-zA-Z]+(.*)$/, "$1"), 10) : 0; - } - } - else if (typeof win.ActiveXObject != UNDEF) { - try { - var a = new ActiveXObject(SHOCKWAVE_FLASH_AX); - if (a) { // a will return null when ActiveX is disabled - d = a.GetVariable("$version"); - if (d) { - ie = true; // cascaded feature detection for Internet Explorer - d = d.split(" ")[1].split(","); - playerVersion = [parseInt(d[0], 10), parseInt(d[1], 10), parseInt(d[2], 10)]; - } - } - } - catch(e) {} - } - return { w3:w3cdom, pv:playerVersion, wk:webkit, ie:ie, win:windows, mac:mac }; - }(), - - /* Cross-browser onDomLoad - - Will fire an event as soon as the DOM of a web page is loaded - - Internet Explorer workaround based on Diego Perini's solution: http://javascript.nwbox.com/IEContentLoaded/ - - Regular onload serves as fallback - */ - onDomLoad = function() { - if (!ua.w3) { return; } - if ((typeof doc.readyState != UNDEF && doc.readyState == "complete") || (typeof doc.readyState == UNDEF && (doc.getElementsByTagName("body")[0] || doc.body))) { // function is fired after onload, e.g. when script is inserted dynamically - callDomLoadFunctions(); - } - if (!isDomLoaded) { - if (typeof doc.addEventListener != UNDEF) { - doc.addEventListener("DOMContentLoaded", callDomLoadFunctions, false); - } - if (ua.ie && ua.win) { - doc.attachEvent(ON_READY_STATE_CHANGE, function() { - if (doc.readyState == "complete") { - doc.detachEvent(ON_READY_STATE_CHANGE, arguments.callee); - callDomLoadFunctions(); - } - }); - if (win == top) { // if not inside an iframe - (function(){ - if (isDomLoaded) { return; } - try { - doc.documentElement.doScroll("left"); - } - catch(e) { - setTimeout(arguments.callee, 0); - return; - } - callDomLoadFunctions(); - })(); - } - } - if (ua.wk) { - (function(){ - if (isDomLoaded) { return; } - if (!/loaded|complete/.test(doc.readyState)) { - setTimeout(arguments.callee, 0); - return; - } - callDomLoadFunctions(); - })(); - } - addLoadEvent(callDomLoadFunctions); - } - }(); - - function callDomLoadFunctions() { - if (isDomLoaded) { return; } - try { // test if we can really add/remove elements to/from the DOM; we don't want to fire it too early - var t = doc.getElementsByTagName("body")[0].appendChild(createElement("span")); - t.parentNode.removeChild(t); - } - catch (e) { return; } - isDomLoaded = true; - var dl = domLoadFnArr.length; - for (var i = 0; i < dl; i++) { - domLoadFnArr[i](); - } - } - - function addDomLoadEvent(fn) { - if (isDomLoaded) { - fn(); - } - else { - domLoadFnArr[domLoadFnArr.length] = fn; // Array.push() is only available in IE5.5+ - } - } - - /* Cross-browser onload - - Based on James Edwards' solution: http://brothercake.com/site/resources/scripts/onload/ - - Will fire an event as soon as a web page including all of its assets are loaded - */ - function addLoadEvent(fn) { - if (typeof win.addEventListener != UNDEF) { - win.addEventListener("load", fn, false); - } - else if (typeof doc.addEventListener != UNDEF) { - doc.addEventListener("load", fn, false); - } - else if (typeof win.attachEvent != UNDEF) { - addListener(win, "onload", fn); - } - else if (typeof win.onload == "function") { - var fnOld = win.onload; - win.onload = function() { - fnOld(); - fn(); - }; - } - else { - win.onload = fn; - } - } - - /* Main function - - Will preferably execute onDomLoad, otherwise onload (as a fallback) - */ - function main() { - if (plugin) { - testPlayerVersion(); - } - else { - matchVersions(); - } - } - - /* Detect the Flash Player version for non-Internet Explorer browsers - - Detecting the plug-in version via the object element is more precise than using the plugins collection item's description: - a. Both release and build numbers can be detected - b. Avoid wrong descriptions by corrupt installers provided by Adobe - c. Avoid wrong descriptions by multiple Flash Player entries in the plugin Array, caused by incorrect browser imports - - Disadvantage of this method is that it depends on the availability of the DOM, while the plugins collection is immediately available - */ - function testPlayerVersion() { - var b = doc.getElementsByTagName("body")[0]; - var o = createElement(OBJECT); - o.setAttribute("type", FLASH_MIME_TYPE); - var t = b.appendChild(o); - if (t) { - var counter = 0; - (function(){ - if (typeof t.GetVariable != UNDEF) { - var d = t.GetVariable("$version"); - if (d) { - d = d.split(" ")[1].split(","); - ua.pv = [parseInt(d[0], 10), parseInt(d[1], 10), parseInt(d[2], 10)]; - } - } - else if (counter < 10) { - counter++; - setTimeout(arguments.callee, 10); - return; - } - b.removeChild(o); - t = null; - matchVersions(); - })(); - } - else { - matchVersions(); - } - } - - /* Perform Flash Player and SWF version matching; static publishing only - */ - function matchVersions() { - var rl = regObjArr.length; - if (rl > 0) { - for (var i = 0; i < rl; i++) { // for each registered object element - var id = regObjArr[i].id; - var cb = regObjArr[i].callbackFn; - var cbObj = {success:false, id:id}; - if (ua.pv[0] > 0) { - var obj = getElementById(id); - if (obj) { - if (hasPlayerVersion(regObjArr[i].swfVersion) && !(ua.wk && ua.wk < 312)) { // Flash Player version >= published SWF version: Houston, we have a match! - setVisibility(id, true); - if (cb) { - cbObj.success = true; - cbObj.ref = getObjectById(id); - cb(cbObj); - } - } - else if (regObjArr[i].expressInstall && canExpressInstall()) { // show the Adobe Express Install dialog if set by the web page author and if supported - var att = {}; - att.data = regObjArr[i].expressInstall; - att.width = obj.getAttribute("width") || "0"; - att.height = obj.getAttribute("height") || "0"; - if (obj.getAttribute("class")) { att.styleclass = obj.getAttribute("class"); } - if (obj.getAttribute("align")) { att.align = obj.getAttribute("align"); } - // parse HTML object param element's name-value pairs - var par = {}; - var p = obj.getElementsByTagName("param"); - var pl = p.length; - for (var j = 0; j < pl; j++) { - if (p[j].getAttribute("name").toLowerCase() != "movie") { - par[p[j].getAttribute("name")] = p[j].getAttribute("value"); - } - } - showExpressInstall(att, par, id, cb); - } - else { // Flash Player and SWF version mismatch or an older Webkit engine that ignores the HTML object element's nested param elements: display alternative content instead of SWF - displayAltContent(obj); - if (cb) { cb(cbObj); } - } - } - } - else { // if no Flash Player is installed or the fp version cannot be detected we let the HTML object element do its job (either show a SWF or alternative content) - setVisibility(id, true); - if (cb) { - var o = getObjectById(id); // test whether there is an HTML object element or not - if (o && typeof o.SetVariable != UNDEF) { - cbObj.success = true; - cbObj.ref = o; - } - cb(cbObj); - } - } - } - } - } - - function getObjectById(objectIdStr) { - var r = null; - var o = getElementById(objectIdStr); - if (o && o.nodeName == "OBJECT") { - if (typeof o.SetVariable != UNDEF) { - r = o; - } - else { - var n = o.getElementsByTagName(OBJECT)[0]; - if (n) { - r = n; - } - } - } - return r; - } - - /* Requirements for Adobe Express Install - - only one instance can be active at a time - - fp 6.0.65 or higher - - Win/Mac OS only - - no Webkit engines older than version 312 - */ - function canExpressInstall() { - return !isExpressInstallActive && hasPlayerVersion("6.0.65") && (ua.win || ua.mac) && !(ua.wk && ua.wk < 312); - } - - /* Show the Adobe Express Install dialog - - Reference: http://www.adobe.com/cfusion/knowledgebase/index.cfm?id=6a253b75 - */ - function showExpressInstall(att, par, replaceElemIdStr, callbackFn) { - isExpressInstallActive = true; - storedCallbackFn = callbackFn || null; - storedCallbackObj = {success:false, id:replaceElemIdStr}; - var obj = getElementById(replaceElemIdStr); - if (obj) { - if (obj.nodeName == "OBJECT") { // static publishing - storedAltContent = abstractAltContent(obj); - storedAltContentId = null; - } - else { // dynamic publishing - storedAltContent = obj; - storedAltContentId = replaceElemIdStr; - } - att.id = EXPRESS_INSTALL_ID; - if (typeof att.width == UNDEF || (!/%$/.test(att.width) && parseInt(att.width, 10) < 310)) { att.width = "310"; } - if (typeof att.height == UNDEF || (!/%$/.test(att.height) && parseInt(att.height, 10) < 137)) { att.height = "137"; } - doc.title = doc.title.slice(0, 47) + " - Flash Player Installation"; - var pt = ua.ie && ua.win ? "ActiveX" : "PlugIn", - fv = "MMredirectURL=" + win.location.toString().replace(/&/g,"%26") + "&MMplayerType=" + pt + "&MMdoctitle=" + doc.title; - if (typeof par.flashvars != UNDEF) { - par.flashvars += "&" + fv; - } - else { - par.flashvars = fv; - } - // IE only: when a SWF is loading (AND: not available in cache) wait for the readyState of the object element to become 4 before removing it, - // because you cannot properly cancel a loading SWF file without breaking browser load references, also obj.onreadystatechange doesn't work - if (ua.ie && ua.win && obj.readyState != 4) { - var newObj = createElement("div"); - replaceElemIdStr += "SWFObjectNew"; - newObj.setAttribute("id", replaceElemIdStr); - obj.parentNode.insertBefore(newObj, obj); // insert placeholder div that will be replaced by the object element that loads expressinstall.swf - obj.style.display = "none"; - (function(){ - if (obj.readyState == 4) { - obj.parentNode.removeChild(obj); - } - else { - setTimeout(arguments.callee, 10); - } - })(); - } - createSWF(att, par, replaceElemIdStr); - } - } - - /* Functions to abstract and display alternative content - */ - function displayAltContent(obj) { - if (ua.ie && ua.win && obj.readyState != 4) { - // IE only: when a SWF is loading (AND: not available in cache) wait for the readyState of the object element to become 4 before removing it, - // because you cannot properly cancel a loading SWF file without breaking browser load references, also obj.onreadystatechange doesn't work - var el = createElement("div"); - obj.parentNode.insertBefore(el, obj); // insert placeholder div that will be replaced by the alternative content - el.parentNode.replaceChild(abstractAltContent(obj), el); - obj.style.display = "none"; - (function(){ - if (obj.readyState == 4) { - obj.parentNode.removeChild(obj); - } - else { - setTimeout(arguments.callee, 10); - } - })(); - } - else { - obj.parentNode.replaceChild(abstractAltContent(obj), obj); - } - } - - function abstractAltContent(obj) { - var ac = createElement("div"); - if (ua.win && ua.ie) { - ac.innerHTML = obj.innerHTML; - } - else { - var nestedObj = obj.getElementsByTagName(OBJECT)[0]; - if (nestedObj) { - var c = nestedObj.childNodes; - if (c) { - var cl = c.length; - for (var i = 0; i < cl; i++) { - if (!(c[i].nodeType == 1 && c[i].nodeName == "PARAM") && !(c[i].nodeType == 8)) { - ac.appendChild(c[i].cloneNode(true)); - } - } - } - } - } - return ac; - } - - /* Cross-browser dynamic SWF creation - */ - function createSWF(attObj, parObj, id) { - var r, el = getElementById(id); - if (ua.wk && ua.wk < 312) { return r; } - if (el) { - if (typeof attObj.id == UNDEF) { // if no 'id' is defined for the object element, it will inherit the 'id' from the alternative content - attObj.id = id; - } - if (ua.ie && ua.win) { // Internet Explorer + the HTML object element + W3C DOM methods do not combine: fall back to outerHTML - var att = ""; - for (var i in attObj) { - if (attObj[i] != Object.prototype[i]) { // filter out prototype additions from other potential libraries - if (i.toLowerCase() == "data") { - parObj.movie = attObj[i]; - } - else if (i.toLowerCase() == "styleclass") { // 'class' is an ECMA4 reserved keyword - att += ' class="' + attObj[i] + '"'; - } - else if (i.toLowerCase() != "classid") { - att += ' ' + i + '="' + attObj[i] + '"'; - } - } - } - var par = ""; - for (var j in parObj) { - if (parObj[j] != Object.prototype[j]) { // filter out prototype additions from other potential libraries - par += ''; - } - } - el.outerHTML = '' + par + ''; - objIdArr[objIdArr.length] = attObj.id; // stored to fix object 'leaks' on unload (dynamic publishing only) - r = getElementById(attObj.id); - } - else { // well-behaving browsers - var o = createElement(OBJECT); - o.setAttribute("type", FLASH_MIME_TYPE); - for (var m in attObj) { - if (attObj[m] != Object.prototype[m]) { // filter out prototype additions from other potential libraries - if (m.toLowerCase() == "styleclass") { // 'class' is an ECMA4 reserved keyword - o.setAttribute("class", attObj[m]); - } - else if (m.toLowerCase() != "classid") { // filter out IE specific attribute - o.setAttribute(m, attObj[m]); - } - } - } - for (var n in parObj) { - if (parObj[n] != Object.prototype[n] && n.toLowerCase() != "movie") { // filter out prototype additions from other potential libraries and IE specific param element - createObjParam(o, n, parObj[n]); - } - } - el.parentNode.replaceChild(o, el); - r = o; - } - } - return r; - } - - function createObjParam(el, pName, pValue) { - var p = createElement("param"); - p.setAttribute("name", pName); - p.setAttribute("value", pValue); - el.appendChild(p); - } - - /* Cross-browser SWF removal - - Especially needed to safely and completely remove a SWF in Internet Explorer - */ - function removeSWF(id) { - var obj = getElementById(id); - if (obj && obj.nodeName == "OBJECT") { - if (ua.ie && ua.win) { - obj.style.display = "none"; - (function(){ - if (obj.readyState == 4) { - removeObjectInIE(id); - } - else { - setTimeout(arguments.callee, 10); - } - })(); - } - else { - obj.parentNode.removeChild(obj); - } - } - } - - function removeObjectInIE(id) { - var obj = getElementById(id); - if (obj) { - for (var i in obj) { - if (typeof obj[i] == "function") { - obj[i] = null; - } - } - obj.parentNode.removeChild(obj); - } - } - - /* Functions to optimize JavaScript compression - */ - function getElementById(id) { - var el = null; - try { - el = doc.getElementById(id); - } - catch (e) {} - return el; - } - - function createElement(el) { - return doc.createElement(el); - } - - /* Updated attachEvent function for Internet Explorer - - Stores attachEvent information in an Array, so on unload the detachEvent functions can be called to avoid memory leaks - */ - function addListener(target, eventType, fn) { - target.attachEvent(eventType, fn); - listenersArr[listenersArr.length] = [target, eventType, fn]; - } - - /* Flash Player and SWF content version matching - */ - function hasPlayerVersion(rv) { - var pv = ua.pv, v = rv.split("."); - v[0] = parseInt(v[0], 10); - v[1] = parseInt(v[1], 10) || 0; // supports short notation, e.g. "9" instead of "9.0.0" - v[2] = parseInt(v[2], 10) || 0; - return (pv[0] > v[0] || (pv[0] == v[0] && pv[1] > v[1]) || (pv[0] == v[0] && pv[1] == v[1] && pv[2] >= v[2])) ? true : false; - } - - /* Cross-browser dynamic CSS creation - - Based on Bobby van der Sluis' solution: http://www.bobbyvandersluis.com/articles/dynamicCSS.php - */ - function createCSS(sel, decl, media, newStyle) { - if (ua.ie && ua.mac) { return; } - var h = doc.getElementsByTagName("head")[0]; - if (!h) { return; } // to also support badly authored HTML pages that lack a head element - var m = (media && typeof media == "string") ? media : "screen"; - if (newStyle) { - dynamicStylesheet = null; - dynamicStylesheetMedia = null; - } - if (!dynamicStylesheet || dynamicStylesheetMedia != m) { - // create dynamic stylesheet + get a global reference to it - var s = createElement("style"); - s.setAttribute("type", "text/css"); - s.setAttribute("media", m); - dynamicStylesheet = h.appendChild(s); - if (ua.ie && ua.win && typeof doc.styleSheets != UNDEF && doc.styleSheets.length > 0) { - dynamicStylesheet = doc.styleSheets[doc.styleSheets.length - 1]; - } - dynamicStylesheetMedia = m; - } - // add style rule - if (ua.ie && ua.win) { - if (dynamicStylesheet && typeof dynamicStylesheet.addRule == OBJECT) { - dynamicStylesheet.addRule(sel, decl); - } - } - else { - if (dynamicStylesheet && typeof doc.createTextNode != UNDEF) { - dynamicStylesheet.appendChild(doc.createTextNode(sel + " {" + decl + "}")); - } - } - } - - function setVisibility(id, isVisible) { - if (!autoHideShow) { return; } - var v = isVisible ? "visible" : "hidden"; - if (isDomLoaded && getElementById(id)) { - getElementById(id).style.visibility = v; - } - else { - createCSS("#" + id, "visibility:" + v); - } - } - - /* Filter to avoid XSS attacks - */ - function urlEncodeIfNecessary(s) { - var regex = /[\\\"<>\.;]/; - var hasBadChars = regex.exec(s) != null; - return hasBadChars && typeof encodeURIComponent != UNDEF ? encodeURIComponent(s) : s; - } - - /* Release memory to avoid memory leaks caused by closures, fix hanging audio/video threads and force open sockets/NetConnections to disconnect (Internet Explorer only) - */ - var cleanup = function() { - if (ua.ie && ua.win) { - window.attachEvent("onunload", function() { - // remove listeners to avoid memory leaks - var ll = listenersArr.length; - for (var i = 0; i < ll; i++) { - listenersArr[i][0].detachEvent(listenersArr[i][1], listenersArr[i][2]); - } - // cleanup dynamically embedded objects to fix audio/video threads and force open sockets and NetConnections to disconnect - var il = objIdArr.length; - for (var j = 0; j < il; j++) { - removeSWF(objIdArr[j]); - } - // cleanup library's main closures to avoid memory leaks - for (var k in ua) { - ua[k] = null; - } - ua = null; - for (var l in swfobject) { - swfobject[l] = null; - } - swfobject = null; - }); - } - }(); - - return { - /* Public API - - Reference: http://code.google.com/p/swfobject/wiki/documentation - */ - registerObject: function(objectIdStr, swfVersionStr, xiSwfUrlStr, callbackFn) { - if (ua.w3 && objectIdStr && swfVersionStr) { - var regObj = {}; - regObj.id = objectIdStr; - regObj.swfVersion = swfVersionStr; - regObj.expressInstall = xiSwfUrlStr; - regObj.callbackFn = callbackFn; - regObjArr[regObjArr.length] = regObj; - setVisibility(objectIdStr, false); - } - else if (callbackFn) { - callbackFn({success:false, id:objectIdStr}); - } - }, - - getObjectById: function(objectIdStr) { - if (ua.w3) { - return getObjectById(objectIdStr); - } - }, - - embedSWF: function(swfUrlStr, replaceElemIdStr, widthStr, heightStr, swfVersionStr, xiSwfUrlStr, flashvarsObj, parObj, attObj, callbackFn) { - var callbackObj = {success:false, id:replaceElemIdStr}; - if (ua.w3 && !(ua.wk && ua.wk < 312) && swfUrlStr && replaceElemIdStr && widthStr && heightStr && swfVersionStr) { - setVisibility(replaceElemIdStr, false); - addDomLoadEvent(function() { - widthStr += ""; // auto-convert to string - heightStr += ""; - var att = {}; - if (attObj && typeof attObj === OBJECT) { - for (var i in attObj) { // copy object to avoid the use of references, because web authors often reuse attObj for multiple SWFs - att[i] = attObj[i]; - } - } - att.data = swfUrlStr; - att.width = widthStr; - att.height = heightStr; - var par = {}; - if (parObj && typeof parObj === OBJECT) { - for (var j in parObj) { // copy object to avoid the use of references, because web authors often reuse parObj for multiple SWFs - par[j] = parObj[j]; - } - } - if (flashvarsObj && typeof flashvarsObj === OBJECT) { - for (var k in flashvarsObj) { // copy object to avoid the use of references, because web authors often reuse flashvarsObj for multiple SWFs - if (typeof par.flashvars != UNDEF) { - par.flashvars += "&" + k + "=" + flashvarsObj[k]; - } - else { - par.flashvars = k + "=" + flashvarsObj[k]; - } - } - } - if (hasPlayerVersion(swfVersionStr)) { // create SWF - var obj = createSWF(att, par, replaceElemIdStr); - if (att.id == replaceElemIdStr) { - setVisibility(replaceElemIdStr, true); - } - callbackObj.success = true; - callbackObj.ref = obj; - } - else if (xiSwfUrlStr && canExpressInstall()) { // show Adobe Express Install - att.data = xiSwfUrlStr; - showExpressInstall(att, par, replaceElemIdStr, callbackFn); - return; - } - else { // show alternative content - setVisibility(replaceElemIdStr, true); - } - if (callbackFn) { callbackFn(callbackObj); } - }); - } - else if (callbackFn) { callbackFn(callbackObj); } - }, - - switchOffAutoHideShow: function() { - autoHideShow = false; - }, - - ua: ua, - - getFlashPlayerVersion: function() { - return { major:ua.pv[0], minor:ua.pv[1], release:ua.pv[2] }; - }, - - hasFlashPlayerVersion: hasPlayerVersion, - - createSWF: function(attObj, parObj, replaceElemIdStr) { - if (ua.w3) { - return createSWF(attObj, parObj, replaceElemIdStr); - } - else { - return undefined; - } - }, - - showExpressInstall: function(att, par, replaceElemIdStr, callbackFn) { - if (ua.w3 && canExpressInstall()) { - showExpressInstall(att, par, replaceElemIdStr, callbackFn); - } - }, - - removeSWF: function(objElemIdStr) { - if (ua.w3) { - removeSWF(objElemIdStr); - } - }, - - createCSS: function(selStr, declStr, mediaStr, newStyleBoolean) { - if (ua.w3) { - createCSS(selStr, declStr, mediaStr, newStyleBoolean); - } - }, - - addDomLoadEvent: addDomLoadEvent, - - addLoadEvent: addLoadEvent, - - getQueryParamValue: function(param) { - var q = doc.location.search || doc.location.hash; - if (q) { - if (/\?/.test(q)) { q = q.split("?")[1]; } // strip question mark - if (param == null) { - return urlEncodeIfNecessary(q); - } - var pairs = q.split("&"); - for (var i = 0; i < pairs.length; i++) { - if (pairs[i].substring(0, pairs[i].indexOf("=")) == param) { - return urlEncodeIfNecessary(pairs[i].substring((pairs[i].indexOf("=") + 1))); - } - } - } - return ""; - }, - - // For internal usage only - expressInstallCallback: function() { - if (isExpressInstallActive) { - var obj = getElementById(EXPRESS_INSTALL_ID); - if (obj && storedAltContent) { - obj.parentNode.replaceChild(storedAltContent, obj); - if (storedAltContentId) { - setVisibility(storedAltContentId, true); - if (ua.ie && ua.win) { storedAltContent.style.display = "block"; } - } - if (storedCallbackFn) { storedCallbackFn(storedCallbackObj); } - } - isExpressInstallActive = false; - } - } - }; -}(); diff --git a/yarn.lock b/yarn.lock index c04f14cfe..5ec48df47 100644 --- a/yarn.lock +++ b/yarn.lock @@ -49,7 +49,7 @@ acorn@^7.4.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.0.tgz#e1ad486e6c54501634c6c397c5c121daa383607c" integrity sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w== -ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4: +ajv@^6.10.0, ajv@^6.12.4: version "6.12.4" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.4.tgz#0614facc4522127fa713445c6bfd3ebd376e2234" integrity sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ== @@ -64,23 +64,25 @@ ansi-colors@^3.2.1: resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf" integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA== -ansi-regex@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" - integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== - ansi-regex@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== -ansi-styles@^3.2.0, ansi-styles@^3.2.1: +ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== dependencies: color-convert "^1.9.0" +ansi-styles@^4.0.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + dependencies: + color-convert "^2.0.1" + ansi-styles@^4.1.0: version "4.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359" @@ -96,10 +98,10 @@ argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" -astral-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9" - integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg== +astral-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" + integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== balanced-match@^1.0.0: version "1.0.0" @@ -198,10 +200,10 @@ doctrine@^3.0.0: dependencies: esutils "^2.0.2" -emoji-regex@^7.0.1: - version "7.0.3" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" - integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== enquirer@^2.3.5: version "2.3.5" @@ -241,9 +243,9 @@ eslint-visitor-keys@^2.0.0: integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== eslint@^7.3.1: - version "7.15.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.15.0.tgz#eb155fb8ed0865fcf5d903f76be2e5b6cd7e0bc7" - integrity sha512-Vr64xFDT8w30wFll643e7cGrIkPEU50yIiI36OdSIDoSGguIeaLzBo0vpGvzo9RECUqq7htURfwEtKqwytkqzA== + version "7.17.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.17.0.tgz#4ccda5bf12572ad3bf760e6f195886f50569adb0" + integrity sha512-zJk08MiBgwuGoxes5sSQhOtibZ75pz0J35XTRlZOk9xMffhpA9BTbQZxoXZzOl5zMbleShbGwtw+1kGferfFwQ== dependencies: "@babel/code-frame" "^7.0.0" "@eslint/eslintrc" "^0.2.2" @@ -279,7 +281,7 @@ eslint@^7.3.1: semver "^7.2.1" strip-ansi "^6.0.0" strip-json-comments "^3.1.0" - table "^5.2.3" + table "^6.0.4" text-table "^0.2.0" v8-compile-cache "^2.0.3" @@ -453,10 +455,10 @@ is-extglob@^2.1.1: resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= -is-fullwidth-code-point@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== is-glob@^4.0.0, is-glob@^4.0.1: version "4.0.1" @@ -526,10 +528,10 @@ levn@^0.4.1: prelude-ls "^1.2.1" type-check "~0.4.0" -lodash@^4.17.14, lodash@^4.17.19: - version "4.17.19" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b" - integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ== +lodash@^4.17.19, lodash@^4.17.20: + version "4.17.20" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" + integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== minimatch@^3.0.4: version "3.0.4" @@ -646,35 +648,28 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -slice-ansi@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636" - integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ== +slice-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b" + integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ== dependencies: - ansi-styles "^3.2.0" - astral-regex "^1.0.0" - is-fullwidth-code-point "^2.0.0" + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= -string-width@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" - integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== +string-width@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" + integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg== dependencies: - emoji-regex "^7.0.1" - is-fullwidth-code-point "^2.0.0" - strip-ansi "^5.1.0" - -strip-ansi@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" - integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== - dependencies: - ansi-regex "^4.1.0" + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.0" strip-ansi@^6.0.0: version "6.0.0" @@ -702,15 +697,15 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" -table@^5.2.3: - version "5.4.6" - resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e" - integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug== +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== dependencies: - ajv "^6.10.2" - lodash "^4.17.14" - slice-ansi "^2.1.0" - string-width "^3.0.0" + ajv "^6.12.4" + lodash "^4.17.20" + slice-ansi "^4.0.0" + string-width "^4.2.0" text-table@^0.2.0: version "0.2.0"